Merge branch 'master' of gitorious.org:social/mainline into social-master

Signed-off-by: Roland Häder <haeder@hmmdeutschland.de>

diff --combined lib/action.php
index e44e4eb168e5535c8d5587c7670806c7e8364117,f3a125d3b5556732d1763e7a82c134cb1c72347e..0aabef4abb5eb800e589ea5364431b429331d36a
--- 1/lib/action.php
--- 2/lib/action.php
+++ b/lib/action.php
@@@ -726,6 -726,8 +726,8 @@@ class Action extends HTMLOutputter // l
  
          $this->elementStart('div', 'input_forms');
  
+         $this->element('label', array('for'=>'input_form_nav'), _m('TAB', 'Share your:'));
+ 
          if (Event::handle('StartShowEntryForms', array(&$tabs))) {
              $this->elementStart('ul', array('class' => 'nav',
                                              'id' => 'input_form_nav'));
@@@ -1216,7 -1218,7 +1218,7 @@@
       *
       * @return boolean is read only action?
       */
 -    function isReadOnly($args)
 +    function isReadOnly(array $args=array())
      {
          return false;
      }

diff --combined lib/framework.php
index 10ce1fe4d038bd46ad9dfca9ef740a7f82385a12,f76db7fbabfbe0e0bf9f974351fb85c1d992f68d..b52c74e5ab31c127049fca2cb262721da0bf6420
--- 1/lib/framework.php
--- 2/lib/framework.php
+++ b/lib/framework.php
@@@ -23,7 -23,7 +23,7 @@@ define('GNUSOCIAL_ENGINE', 'GNU social'
  define('GNUSOCIAL_ENGINE_URL', 'https://www.gnu.org/software/social/');
  
  define('GNUSOCIAL_BASE_VERSION', '1.1.3');
- define('GNUSOCIAL_LIFECYCLE', 'beta'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release'
+ define('GNUSOCIAL_LIFECYCLE', 'beta1'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release'
  
  define('GNUSOCIAL_VERSION', GNUSOCIAL_BASE_VERSION . '-' . GNUSOCIAL_LIFECYCLE);
  
@@@ -105,28 -105,6 +105,28 @@@ function _have_config(
      return StatusNet::haveConfig();
  }
  
 +function common_get_temp_dir()
 +{
 +    // Try to get it from php.ini first
 +    $temp_path = trim(ini_get('upload_tmp_dir'));
 +
 +    // Is it empty?
 +    if (strlen($temp_path) == 0) {
 +        // Then try sys_get_temp_dir()
 +        $temp_path = trim(sys_get_temp_dir());
 +
 +        // Still empty?
 +        if (strlen($temp_path) == 0) {
 +            // Then set it to /tmp (ugly)
 +            // @TODO Hard-coded non-Windows stuff!
 +            $temp_path = '/tmp';
 +        }
 +    }
 +
 +    // Return found path
 +    return $temp_path;
 +}
 +
  function GNUsocial_class_autoload($cls)
  {
      if (file_exists(INSTALLDIR.'/classes/' . $cls . '.php')) {
@@@ -143,7 -121,6 +143,7 @@@
      }
  }
  
 +
  // Autoload function queue, starting with our own discovery method
  spl_autoload_register('GNUsocial_class_autoload');