Merge remote branch 'gitorious/testing' into testing

diff --combined plugins/NewMenu/NewMenuPlugin.php
index db334c66091fba34b2327b5386afd741c3e7cf7e,14950ab079887911a9bb74b79afefe358279d80a..7aad0672bf995ad441c4a925a60440fc91162c48
--- 1/plugins/NewMenu/NewMenuPlugin.php
--- 2/plugins/NewMenu/NewMenuPlugin.php
+++ b/plugins/NewMenu/NewMenuPlugin.php
@@@ -53,6 -53,31 +53,6 @@@ class NewMenuPlugin extends Plugi
  {
      public $loadCSS = false;
  
 -    /**
 -     * Load related modules when needed
 -     *
 -     * @param string $cls Name of the class to be loaded
 -     *
 -     * @return boolean hook value; true means continue processing, false means stop.
 -     */
 -
 -    function onAutoload($cls)
 -    {
 -        $dir = dirname(__FILE__);
 -
 -        switch ($cls)
 -        {
 -        case 'HelloAction':
 -            include_once $dir . '/' . strtolower(mb_substr($cls, 0, -6)) . '.php';
 -            return false;
 -        case 'User_greeting_count':
 -            include_once $dir . '/'.$cls.'.php';
 -            return false;
 -        default:
 -            return true;
 -        }
 -    }
 -
      /**
       * Modify the default menu
       *
@@@ -254,19 -279,19 +254,19 @@@
          return true;
      }
  
-     function onStartAccountSettingsNav(&$action)
+     function onStartAccountSettingsNav($action)
      {
          $this->_settingsMenu($action);
          return false;
      }
  
-     function onStartConnectSettingsNav(&$action)
+     function onStartConnectSettingsNav($action)
      {
          $this->_settingsMenu($action);
          return false;
      }
  
-     private function _settingsMenu(&$action)
+     private function _settingsMenu($action)
      {
          $actionName = $action->trimmed('action');
  
@@@ -300,7 -325,7 +300,7 @@@
                            _('Other options'),
                            $actionName == 'othersettings');
  
-         Event::handle('EndAccountSettingsNav', array(&$action));
+         Event::handle('EndAccountSettingsNav', array($action));
          
          if (common_config('xmpp', 'enabled')) {
              $action->menuItem(common_local_url('imsettings'),
@@@ -321,7 -346,7 +321,7 @@@
                            _('Authorized connected applications'),
                            $actionName == 'oauthconnectionsettings');
  
-         Event::handle('EndConnectSettingsNav', array(&$action));
+         Event::handle('EndConnectSettingsNav', array($action));
      }
  
      function onEndShowStyles($action)