From 56e2bc10d97a0241d3ce9e8abadd3d42658701ec Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 18 Jan 2011 12:34:27 -0800 Subject: [PATCH] Cleanup stray PHP 4-style references in hook calls for navigation bars. We can't replace the live action from here, and don't need a reference to keep the object mutable. Dumping the references helps ensure we don't end up getting errors when things calling the hooks might forget to use the reference and the PHP error reporting settings expose this fact at us. --- lib/accountsettingsaction.php | 4 ++-- lib/connectsettingsaction.php | 4 ++-- lib/logingroupnav.php | 4 ++-- lib/userprofile.php | 12 ++++++------ .../CasAuthentication/CasAuthenticationPlugin.php | 2 +- plugins/Facebook/FacebookPlugin.php | 8 ++++---- plugins/FacebookBridge/FacebookBridgePlugin.php | 8 ++++---- plugins/NewMenu/NewMenuPlugin.php | 10 +++++----- plugins/OpenID/OpenIDPlugin.php | 12 ++++++------ plugins/TwitterBridge/TwitterBridgePlugin.php | 8 ++++---- plugins/UserFlag/UserFlagPlugin.php | 4 ++-- 11 files changed, 38 insertions(+), 38 deletions(-) diff --git a/lib/accountsettingsaction.php b/lib/accountsettingsaction.php index 7991c9002c..b1ea998bfa 100644 --- a/lib/accountsettingsaction.php +++ b/lib/accountsettingsaction.php @@ -96,7 +96,7 @@ class AccountSettingsNav extends Widget $action_name = $this->action->trimmed('action'); $this->action->elementStart('ul', array('class' => 'nav')); - if (Event::handle('StartAccountSettingsNav', array(&$this->action))) { + if (Event::handle('StartAccountSettingsNav', array($this->action))) { $user = common_current_user(); if(Event::handle('StartAccountSettingsProfileMenuItem', array($this, &$menu))){ @@ -142,7 +142,7 @@ class AccountSettingsNav extends Widget Event::handle('EndAccountSettingsOtherMenuItem', array($this, &$menu)); } - Event::handle('EndAccountSettingsNav', array(&$this->action)); + Event::handle('EndAccountSettingsNav', array($this->action)); } $this->action->elementEnd('ul'); diff --git a/lib/connectsettingsaction.php b/lib/connectsettingsaction.php index 325276c5fc..20f18ef0d9 100644 --- a/lib/connectsettingsaction.php +++ b/lib/connectsettingsaction.php @@ -96,7 +96,7 @@ class ConnectSettingsNav extends Widget $action_name = $this->action->trimmed('action'); $this->action->elementStart('ul', array('class' => 'nav')); - if (Event::handle('StartConnectSettingsNav', array(&$this->action))) { + if (Event::handle('StartConnectSettingsNav', array($this->action))) { # action => array('prompt', 'title') $menu = array(); @@ -129,7 +129,7 @@ class ConnectSettingsNav extends Widget $action_name === $menuaction); } - Event::handle('EndConnectSettingsNav', array(&$this->action)); + Event::handle('EndConnectSettingsNav', array($this->action)); } $this->action->elementEnd('ul'); diff --git a/lib/logingroupnav.php b/lib/logingroupnav.php index b545fbf269..0fd0f45c7d 100644 --- a/lib/logingroupnav.php +++ b/lib/logingroupnav.php @@ -73,7 +73,7 @@ class LoginGroupNav extends Widget $this->action->elementStart('ul', array('class' => 'nav')); - if (Event::handle('StartLoginGroupNav', array(&$this->action))) { + if (Event::handle('StartLoginGroupNav', array($this->action))) { $this->action->menuItem(common_local_url('login'), _('Login'), @@ -87,7 +87,7 @@ class LoginGroupNav extends Widget $action_name === 'register'); } - Event::handle('EndLoginGroupNav', array(&$this->action)); + Event::handle('EndLoginGroupNav', array($this->action)); } $this->action->elementEnd('ul'); diff --git a/lib/userprofile.php b/lib/userprofile.php index 2813f735ea..91c5fb413a 100644 --- a/lib/userprofile.php +++ b/lib/userprofile.php @@ -242,7 +242,7 @@ class UserProfile extends Widget $this->out->elementEnd('div'); return; } - if (Event::handle('StartProfilePageActionsSection', array(&$this->out, $this->profile))) { + if (Event::handle('StartProfilePageActionsSection', array($this->out, $this->profile))) { $cur = common_current_user(); @@ -250,13 +250,13 @@ class UserProfile extends Widget $this->out->element('h2', null, _('User actions')); $this->out->elementStart('ul'); - if (Event::handle('StartProfilePageActionsElements', array(&$this->out, $this->profile))) { + if (Event::handle('StartProfilePageActionsElements', array($this->out, $this->profile))) { if (empty($cur)) { // not logged in - if (Event::handle('StartProfileRemoteSubscribe', array(&$this->out, $this->profile))) { + if (Event::handle('StartProfileRemoteSubscribe', array($this->out, $this->profile))) { $this->out->elementStart('li', 'entity_subscribe'); $this->showRemoteSubscribeLink(); $this->out->elementEnd('li'); - Event::handle('EndProfileRemoteSubscribe', array(&$this->out, $this->profile)); + Event::handle('EndProfileRemoteSubscribe', array($this->out, $this->profile)); } } else { if ($cur->id == $this->profile->id) { // your own page @@ -376,13 +376,13 @@ class UserProfile extends Widget } } - Event::handle('EndProfilePageActionsElements', array(&$this->out, $this->profile)); + Event::handle('EndProfilePageActionsElements', array($this->out, $this->profile)); } $this->out->elementEnd('ul'); $this->out->elementEnd('div'); - Event::handle('EndProfilePageActionsSection', array(&$this->out, $this->profile)); + Event::handle('EndProfilePageActionsSection', array($this->out, $this->profile)); } } diff --git a/plugins/CasAuthentication/CasAuthenticationPlugin.php b/plugins/CasAuthentication/CasAuthenticationPlugin.php index 71e54d41f9..3196bd94a7 100644 --- a/plugins/CasAuthentication/CasAuthenticationPlugin.php +++ b/plugins/CasAuthentication/CasAuthenticationPlugin.php @@ -74,7 +74,7 @@ class CasAuthenticationPlugin extends AuthenticationPlugin return true; } - function onEndLoginGroupNav(&$action) + function onEndLoginGroupNav($action) { $action_name = $action->trimmed('action'); diff --git a/plugins/Facebook/FacebookPlugin.php b/plugins/Facebook/FacebookPlugin.php index 798009817c..e877d300b6 100644 --- a/plugins/Facebook/FacebookPlugin.php +++ b/plugins/Facebook/FacebookPlugin.php @@ -446,11 +446,11 @@ class FacebookPlugin extends Plugin /* * Add a login tab for Facebook Connect * - * @param Action &action the current action + * @param Action $action the current action * * @return void */ - function onEndLoginGroupNav(&$action) + function onEndLoginGroupNav($action) { if (self::hasKeys()) { $action_name = $action->trimmed('action'); @@ -470,11 +470,11 @@ class FacebookPlugin extends Plugin /* * Add a tab for managing Facebook Connect settings * - * @param Action &action the current action + * @param Action $action the current action * * @return void */ - function onEndConnectSettingsNav(&$action) + function onEndConnectSettingsNav($action) { if (self::hasKeys()) { $action_name = $action->trimmed('action'); diff --git a/plugins/FacebookBridge/FacebookBridgePlugin.php b/plugins/FacebookBridge/FacebookBridgePlugin.php index 8b5d05e983..000b214ff4 100644 --- a/plugins/FacebookBridge/FacebookBridgePlugin.php +++ b/plugins/FacebookBridge/FacebookBridgePlugin.php @@ -186,11 +186,11 @@ class FacebookBridgePlugin extends Plugin * Add a login tab for Facebook, but only if there's a Facebook * application defined for the plugin to use. * - * @param Action &action the current action + * @param Action $action the current action * * @return void */ - function onEndLoginGroupNav(&$action) + function onEndLoginGroupNav($action) { $action_name = $action->trimmed('action'); @@ -252,11 +252,11 @@ class FacebookBridgePlugin extends Plugin * Add a tab for user-level Facebook settings if the user * has a link to Facebook * - * @param Action &action the current action + * @param Action $action the current action * * @return void */ - function onEndConnectSettingsNav(&$action) + function onEndConnectSettingsNav($action) { if ($this->hasApplication()) { $action_name = $action->trimmed('action'); diff --git a/plugins/NewMenu/NewMenuPlugin.php b/plugins/NewMenu/NewMenuPlugin.php index cdcea5cd92..14950ab079 100644 --- a/plugins/NewMenu/NewMenuPlugin.php +++ b/plugins/NewMenu/NewMenuPlugin.php @@ -279,19 +279,19 @@ class NewMenuPlugin extends Plugin 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'); @@ -325,7 +325,7 @@ class NewMenuPlugin extends Plugin _('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'), @@ -346,7 +346,7 @@ class NewMenuPlugin extends Plugin _('Authorized connected applications'), $actionName == 'oauthconnectionsettings'); - Event::handle('EndConnectSettingsNav', array(&$action)); + Event::handle('EndConnectSettingsNav', array($action)); } function onEndShowStyles($action) diff --git a/plugins/OpenID/OpenIDPlugin.php b/plugins/OpenID/OpenIDPlugin.php index d5a8c1bf02..2635cb7c9d 100644 --- a/plugins/OpenID/OpenIDPlugin.php +++ b/plugins/OpenID/OpenIDPlugin.php @@ -248,11 +248,11 @@ class OpenIDPlugin extends Plugin * * If we're in openidOnly mode, we disable the menu for all other login. * - * @param Action &$action Action being executed + * @param Action $action Action being executed * * @return boolean hook return */ - function onStartLoginGroupNav(&$action) + function onStartLoginGroupNav($action) { if (common_config('site', 'openidonly')) { $this->showOpenIDLoginTab($action); @@ -268,11 +268,11 @@ class OpenIDPlugin extends Plugin /** * Menu item for login * - * @param Action &$action Action being executed + * @param Action $action Action being executed * * @return boolean hook return */ - function onEndLoginGroupNav(&$action) + function onEndLoginGroupNav($action) { $this->showOpenIDLoginTab($action); @@ -318,11 +318,11 @@ class OpenIDPlugin extends Plugin /** * Menu item for OpenID settings * - * @param Action &$action Action being executed + * @param Action $action Action being executed * * @return boolean hook return */ - function onEndAccountSettingsNav(&$action) + function onEndAccountSettingsNav($action) { $action_name = $action->trimmed('action'); diff --git a/plugins/TwitterBridge/TwitterBridgePlugin.php b/plugins/TwitterBridge/TwitterBridgePlugin.php index b2dce6f1c0..048daad98f 100644 --- a/plugins/TwitterBridge/TwitterBridgePlugin.php +++ b/plugins/TwitterBridge/TwitterBridgePlugin.php @@ -137,11 +137,11 @@ class TwitterBridgePlugin extends Plugin /* * Add a login tab for 'Sign in with Twitter' * - * @param Action &action the current action + * @param Action $action the current action * * @return void */ - function onEndLoginGroupNav(&$action) + function onEndLoginGroupNav($action) { $action_name = $action->trimmed('action'); @@ -160,11 +160,11 @@ class TwitterBridgePlugin extends Plugin /** * Add the Twitter Settings page to the Connect Settings menu * - * @param Action &$action The calling page + * @param Action $action The calling page * * @return boolean hook return */ - function onEndConnectSettingsNav(&$action) + function onEndConnectSettingsNav($action) { if (self::hasKeys()) { $action_name = $action->trimmed('action'); diff --git a/plugins/UserFlag/UserFlagPlugin.php b/plugins/UserFlag/UserFlagPlugin.php index fc7698841e..a375717ccd 100644 --- a/plugins/UserFlag/UserFlagPlugin.php +++ b/plugins/UserFlag/UserFlagPlugin.php @@ -121,12 +121,12 @@ class UserFlagPlugin extends Plugin /** * Add a 'flag' button to profile page * - * @param Action &$action The action being called + * @param Action $action The action being called * @param Profile $profile Profile being shown * * @return boolean hook result */ - function onEndProfilePageActionsElements(&$action, $profile) + function onEndProfilePageActionsElements($action, $profile) { $this->showFlagButton($action, $profile, array('action' => 'showstream',