From f8b49e69d02806110cbc780fce4671fbe3357438 Mon Sep 17 00:00:00 2001 From: Mikael Nordfeldth Date: Tue, 29 Oct 2013 10:26:46 +0100 Subject: [PATCH] Protected function prepare with array $args defaulting to array() --- actions/apiaccountregister.php | 2 +- actions/apiaccountupdatebackgroundcolor.php | 2 +- actions/apiaccountupdatelinkcolor.php | 2 +- actions/apiaccountupdateprofile.php | 2 +- actions/apiattachment.php | 2 +- actions/apiblockcreate.php | 2 +- actions/apiblockdestroy.php | 2 +- actions/apicheckhub.php | 2 +- actions/apichecknickname.php | 2 +- actions/apidirectmessagenew.php | 2 +- actions/apiexternalprofileshow.php | 2 +- actions/apifriendshipscreate.php | 2 +- actions/apigroupadmins.php | 2 +- actions/apigroupcreate.php | 2 +- actions/apigroupismember.php | 2 +- actions/apigroupjoin.php | 2 +- actions/apigroupleave.php | 2 +- actions/apigrouplist.php | 2 +- actions/apigroupmembership.php | 2 +- actions/apigroupprofileupdate.php | 2 +- actions/apigroupshow.php | 2 +- actions/apilist.php | 2 +- actions/apilistmember.php | 2 +- actions/apilistmemberships.php | 2 +- actions/apilists.php | 2 +- actions/apilistsubscriptions.php | 2 +- actions/apistatusesfavs.php | 2 +- actions/apisubscriptions.php | 2 +- actions/apitimelinefavorites.php | 2 +- actions/apitimelinefriends.php | 2 +- actions/apitimelinegroup.php | 2 +- actions/apitimelinehome.php | 2 +- actions/apitimelinelist.php | 2 +- actions/apitimelinementions.php | 2 +- actions/apitimelineuser.php | 2 +- actions/apiuserprofileimage.php | 2 +- actions/apiusershow.php | 2 +- actions/newmessage.php | 2 +- actions/repeat.php | 2 +- actions/showstream.php | 2 +- lib/apilistusers.php | 2 +- lib/profileaction.php | 2 +- plugins/Autocomplete/actions/autocomplete.php | 2 +- plugins/OStatus/actions/ostatusinit.php | 2 +- plugins/OStatus/actions/pushhub.php | 2 +- 45 files changed, 45 insertions(+), 45 deletions(-) diff --git a/actions/apiaccountregister.php b/actions/apiaccountregister.php index abddbeacab..9926fc8cf9 100644 --- a/actions/apiaccountregister.php +++ b/actions/apiaccountregister.php @@ -54,7 +54,7 @@ class ApiAccountRegisterAction extends ApiAction * * @return boolean success flag */ - protected function prepare($args) + protected function prepare(array $args=array()) { parent::prepare($args); diff --git a/actions/apiaccountupdatebackgroundcolor.php b/actions/apiaccountupdatebackgroundcolor.php index 0588ece730..1839d7ae24 100644 --- a/actions/apiaccountupdatebackgroundcolor.php +++ b/actions/apiaccountupdatebackgroundcolor.php @@ -41,7 +41,7 @@ class ApiAccountUpdateBackgroundColorAction extends ApiAuthAction * * @return boolean success flag */ - protected function prepare($args) + protected function prepare(array $args=array()) { parent::prepare($args); diff --git a/actions/apiaccountupdatelinkcolor.php b/actions/apiaccountupdatelinkcolor.php index 076ab234a0..a81523d094 100644 --- a/actions/apiaccountupdatelinkcolor.php +++ b/actions/apiaccountupdatelinkcolor.php @@ -41,7 +41,7 @@ class ApiAccountUpdateLinkColorAction extends ApiAuthAction * * @return boolean success flag */ - protected function prepare($args) + protected function prepare(array $args=array()) { parent::prepare($args); diff --git a/actions/apiaccountupdateprofile.php b/actions/apiaccountupdateprofile.php index 6b9c358e7b..0e4a4fb376 100644 --- a/actions/apiaccountupdateprofile.php +++ b/actions/apiaccountupdateprofile.php @@ -52,7 +52,7 @@ class ApiAccountUpdateProfileAction extends ApiAuthAction * * @return boolean success flag */ - protected function prepare($args) + protected function prepare(array $args=array()) { parent::prepare($args); diff --git a/actions/apiattachment.php b/actions/apiattachment.php index 0a0b342990..505d50330e 100644 --- a/actions/apiattachment.php +++ b/actions/apiattachment.php @@ -46,7 +46,7 @@ class ApiAttachmentAction extends ApiAuthAction * * @return boolean success flag */ - protected function prepare($args) + protected function prepare(array $args=array()) { parent::prepare($args); diff --git a/actions/apiblockcreate.php b/actions/apiblockcreate.php index 9593236991..d73c24c38f 100644 --- a/actions/apiblockcreate.php +++ b/actions/apiblockcreate.php @@ -58,7 +58,7 @@ class ApiBlockCreateAction extends ApiAuthAction * @return boolean success flag * */ - protected function prepare($args) + protected function prepare(array $args=array()) { parent::prepare($args); diff --git a/actions/apiblockdestroy.php b/actions/apiblockdestroy.php index 692e10f727..d5b2913970 100644 --- a/actions/apiblockdestroy.php +++ b/actions/apiblockdestroy.php @@ -56,7 +56,7 @@ class ApiBlockDestroyAction extends ApiAuthAction * * @return boolean success flag */ - protected function prepare($args) + protected function prepare(array $args=array()) { parent::prepare($args); diff --git a/actions/apicheckhub.php b/actions/apicheckhub.php index bad4031f07..e11b7da4b7 100644 --- a/actions/apicheckhub.php +++ b/actions/apicheckhub.php @@ -43,7 +43,7 @@ class ApiCheckHubAction extends ApiAuthAction * * @return boolean success flag */ - protected function prepare($args) + protected function prepare(array $args=array()) { parent::prepare($args); diff --git a/actions/apichecknickname.php b/actions/apichecknickname.php index 1d9c6842f3..73063c61b7 100644 --- a/actions/apichecknickname.php +++ b/actions/apichecknickname.php @@ -34,7 +34,7 @@ if (!defined('GNUSOCIAL')) { exit(1); } class ApiCheckNicknameAction extends ApiAction { - protected function prepare($args) + protected function prepare(array $args=array()) { parent::prepare($args); diff --git a/actions/apidirectmessagenew.php b/actions/apidirectmessagenew.php index 41039cf0df..9624e51695 100644 --- a/actions/apidirectmessagenew.php +++ b/actions/apidirectmessagenew.php @@ -61,7 +61,7 @@ class ApiDirectMessageNewAction extends ApiAuthAction * * @return boolean success flag */ - protected function prepare($args) + protected function prepare(array $args=array()) { parent::prepare($args); diff --git a/actions/apiexternalprofileshow.php b/actions/apiexternalprofileshow.php index 4e9f3ebc48..4e8419cf6b 100644 --- a/actions/apiexternalprofileshow.php +++ b/actions/apiexternalprofileshow.php @@ -42,7 +42,7 @@ class ApiExternalProfileShowAction extends ApiPrivateAuthAction * @return boolean success flag * */ - protected function prepare($args) + protected function prepare(array $args=array()) { parent::prepare($args); diff --git a/actions/apifriendshipscreate.php b/actions/apifriendshipscreate.php index 500610563e..873883c651 100644 --- a/actions/apifriendshipscreate.php +++ b/actions/apifriendshipscreate.php @@ -60,7 +60,7 @@ class ApiFriendshipsCreateAction extends ApiAuthAction * @return boolean success flag * */ - protected function prepare($args) + protected function prepare(array $args=array()) { parent::prepare($args); diff --git a/actions/apigroupadmins.php b/actions/apigroupadmins.php index c1f28e4a2d..e0b2475072 100644 --- a/actions/apigroupadmins.php +++ b/actions/apigroupadmins.php @@ -61,7 +61,7 @@ class ApiGroupAdminsAction extends ApiPrivateAuthAction * * @return boolean success flag */ - protected function prepare($args) + protected function prepare(array $args=array()) { parent::prepare($args); diff --git a/actions/apigroupcreate.php b/actions/apigroupcreate.php index 1e36f3e7b9..561c721975 100644 --- a/actions/apigroupcreate.php +++ b/actions/apigroupcreate.php @@ -67,7 +67,7 @@ class ApiGroupCreateAction extends ApiAuthAction * * @return boolean success flag */ - protected function prepare($args) + protected function prepare(array $args=array()) { parent::prepare($args); diff --git a/actions/apigroupismember.php b/actions/apigroupismember.php index 530da57729..c085f7b3c1 100644 --- a/actions/apigroupismember.php +++ b/actions/apigroupismember.php @@ -59,7 +59,7 @@ class ApiGroupIsMemberAction extends ApiBareAuthAction * @return boolean success flag */ - protected function prepare($args) + protected function prepare(array $args=array()) { parent::prepare($args); diff --git a/actions/apigroupjoin.php b/actions/apigroupjoin.php index f95c55f845..10081ae1b5 100644 --- a/actions/apigroupjoin.php +++ b/actions/apigroupjoin.php @@ -60,7 +60,7 @@ class ApiGroupJoinAction extends ApiAuthAction * * @return boolean success flag */ - protected function prepare($args) + protected function prepare(array $args=array()) { parent::prepare($args); diff --git a/actions/apigroupleave.php b/actions/apigroupleave.php index 0850ee2e64..c59cb362c2 100644 --- a/actions/apigroupleave.php +++ b/actions/apigroupleave.php @@ -60,7 +60,7 @@ class ApiGroupLeaveAction extends ApiAuthAction * * @return boolean success flag */ - protected function prepare($args) + protected function prepare(array $args=array()) { parent::prepare($args); diff --git a/actions/apigrouplist.php b/actions/apigrouplist.php index 311416799e..1953752b02 100644 --- a/actions/apigrouplist.php +++ b/actions/apigrouplist.php @@ -58,7 +58,7 @@ class ApiGroupListAction extends ApiBareAuthAction * * @return boolean success flag */ - protected function prepare($args) + protected function prepare(array $args=array()) { parent::prepare($args); diff --git a/actions/apigroupmembership.php b/actions/apigroupmembership.php index 3fdac2f4ce..0e01f92f00 100644 --- a/actions/apigroupmembership.php +++ b/actions/apigroupmembership.php @@ -59,7 +59,7 @@ class ApiGroupMembershipAction extends ApiPrivateAuthAction * * @return boolean success flag */ - protected function prepare($args) + protected function prepare(array $args=array()) { parent::prepare($args); diff --git a/actions/apigroupprofileupdate.php b/actions/apigroupprofileupdate.php index c3ceb92a38..9a4592f423 100644 --- a/actions/apigroupprofileupdate.php +++ b/actions/apigroupprofileupdate.php @@ -51,7 +51,7 @@ class ApiGroupProfileUpdateAction extends ApiAuthAction * @return boolean success flag * */ - protected function prepare($args) + protected function prepare(array $args=array()) { parent::prepare($args); diff --git a/actions/apigroupshow.php b/actions/apigroupshow.php index 2384c19b56..a1643302e1 100644 --- a/actions/apigroupshow.php +++ b/actions/apigroupshow.php @@ -59,7 +59,7 @@ class ApiGroupShowAction extends ApiPrivateAuthAction * * @return boolean success flag */ - protected function prepare($args) + protected function prepare(array $args=array()) { parent::prepare($args); diff --git a/actions/apilist.php b/actions/apilist.php index 21466954e1..dc909e62a6 100644 --- a/actions/apilist.php +++ b/actions/apilist.php @@ -59,7 +59,7 @@ class ApiListAction extends ApiBareAuthAction * * @return boolean success flag */ - protected function prepare($args) + protected function prepare(array $args=array()) { parent::prepare($args); diff --git a/actions/apilistmember.php b/actions/apilistmember.php index e631d710d2..92cbc9a3d2 100644 --- a/actions/apilistmember.php +++ b/actions/apilistmember.php @@ -56,7 +56,7 @@ class ApiListMemberAction extends ApiBareAuthAction * * @return boolean success flag */ - protected function prepare($args) + protected function prepare(array $args=array()) { parent::prepare($args); diff --git a/actions/apilistmemberships.php b/actions/apilistmemberships.php index d897853444..04c7715363 100644 --- a/actions/apilistmemberships.php +++ b/actions/apilistmemberships.php @@ -57,7 +57,7 @@ class ApiListMembershipsAction extends ApiBareAuthAction * @return boolean success flag * */ - protected function prepare($args) + protected function prepare(array $args=array()) { parent::prepare($args); diff --git a/actions/apilists.php b/actions/apilists.php index ac76c744d7..4134577e09 100644 --- a/actions/apilists.php +++ b/actions/apilists.php @@ -61,7 +61,7 @@ class ApiListsAction extends ApiBareAuthAction * * @return boolean success flag */ - protected function prepare($args) + protected function prepare(array $args=array()) { parent::prepare($args); diff --git a/actions/apilistsubscriptions.php b/actions/apilistsubscriptions.php index d61b0e856e..e5d8aebc4f 100644 --- a/actions/apilistsubscriptions.php +++ b/actions/apilistsubscriptions.php @@ -46,7 +46,7 @@ class ApiListSubscriptionsAction extends ApiBareAuthAction * @return boolean success flag * */ - protected function prepare($args) + protected function prepare(array $args=array()) { parent::prepare($args); diff --git a/actions/apistatusesfavs.php b/actions/apistatusesfavs.php index 8e637b41cf..01a5d3014e 100644 --- a/actions/apistatusesfavs.php +++ b/actions/apistatusesfavs.php @@ -46,7 +46,7 @@ class ApiStatusesFavsAction extends ApiAuthAction * * @return boolean success flag */ - protected function prepare($args) + protected function prepare(array $args=array()) { parent::prepare($args); diff --git a/actions/apisubscriptions.php b/actions/apisubscriptions.php index 6d50de9506..081445129d 100644 --- a/actions/apisubscriptions.php +++ b/actions/apisubscriptions.php @@ -60,7 +60,7 @@ abstract class ApiSubscriptionsAction extends ApiBareAuthAction * * @return boolean success flag */ - protected function prepare($args) + protected function prepare(array $args=array()) { parent::prepare($args); diff --git a/actions/apitimelinefavorites.php b/actions/apitimelinefavorites.php index 6a57219163..13dc842447 100644 --- a/actions/apitimelinefavorites.php +++ b/actions/apitimelinefavorites.php @@ -57,7 +57,7 @@ class ApiTimelineFavoritesAction extends ApiBareAuthAction * * @return boolean success flag */ - protected function prepare($args) + protected function prepare(array $args=array()) { parent::prepare($args); diff --git a/actions/apitimelinefriends.php b/actions/apitimelinefriends.php index cab9f37808..9a0221b1a2 100644 --- a/actions/apitimelinefriends.php +++ b/actions/apitimelinefriends.php @@ -161,7 +161,7 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction * @return boolean success flag * */ - protected function prepare($args) + protected function prepare(array $args=array()) { parent::prepare($args); $this->target = $this->getTargetProfile($this->arg('id')); diff --git a/actions/apitimelinegroup.php b/actions/apitimelinegroup.php index b2b549557c..4201eb55f8 100644 --- a/actions/apitimelinegroup.php +++ b/actions/apitimelinegroup.php @@ -60,7 +60,7 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction * @return boolean success flag * */ - protected function prepare($args) + protected function prepare(array $args=array()) { parent::prepare($args); diff --git a/actions/apitimelinehome.php b/actions/apitimelinehome.php index 1eb7341ef0..02f3282840 100644 --- a/actions/apitimelinehome.php +++ b/actions/apitimelinehome.php @@ -65,7 +65,7 @@ class ApiTimelineHomeAction extends ApiBareAuthAction * * @return boolean success flag */ - protected function prepare($args) + protected function prepare(array $args=array()) { parent::prepare($args); diff --git a/actions/apitimelinelist.php b/actions/apitimelinelist.php index fc61e7ce2d..91b26bf6c7 100644 --- a/actions/apitimelinelist.php +++ b/actions/apitimelinelist.php @@ -66,7 +66,7 @@ class ApiTimelineListAction extends ApiPrivateAuthAction * @return boolean success flag * */ - protected function prepare($args) + protected function prepare(array $args=array()) { parent::prepare($args); diff --git a/actions/apitimelinementions.php b/actions/apitimelinementions.php index f0113bb5ff..ce6c73c0d1 100644 --- a/actions/apitimelinementions.php +++ b/actions/apitimelinementions.php @@ -64,7 +64,7 @@ class ApiTimelineMentionsAction extends ApiBareAuthAction * * @return boolean success flag */ - protected function prepare($args) + protected function prepare(array $args=array()) { parent::prepare($args); diff --git a/actions/apitimelineuser.php b/actions/apitimelineuser.php index 9696ea3615..f551dc72f7 100644 --- a/actions/apitimelineuser.php +++ b/actions/apitimelineuser.php @@ -66,7 +66,7 @@ class ApiTimelineUserAction extends ApiBareAuthAction * * @return boolean success flag */ - protected function prepare($args) + protected function prepare(array $args=array()) { parent::prepare($args); diff --git a/actions/apiuserprofileimage.php b/actions/apiuserprofileimage.php index cb5c959d08..47fc5e69ac 100644 --- a/actions/apiuserprofileimage.php +++ b/actions/apiuserprofileimage.php @@ -51,7 +51,7 @@ class ApiUserProfileImageAction extends ApiPrivateAuthAction * @return boolean success flag * */ - protected function prepare($args) + protected function prepare(array $args=array()) { parent::prepare($args); $user = User::getKV('nickname', $this->arg('screen_name')); diff --git a/actions/apiusershow.php b/actions/apiusershow.php index 4785c83f0e..35b5069860 100644 --- a/actions/apiusershow.php +++ b/actions/apiusershow.php @@ -57,7 +57,7 @@ class ApiUserShowAction extends ApiPrivateAuthAction * @return boolean success flag * */ - protected function prepare($args) + protected function prepare(array $args=array()) { parent::prepare($args); diff --git a/actions/newmessage.php b/actions/newmessage.php index 364be72a1a..96ada1cee8 100644 --- a/actions/newmessage.php +++ b/actions/newmessage.php @@ -74,7 +74,7 @@ class NewmessageAction extends FormAction * @return void */ - protected function prepare($args) + protected function prepare(array $args=array()) { parent::prepare($args); diff --git a/actions/repeat.php b/actions/repeat.php index 04952f5aea..9e527c5269 100644 --- a/actions/repeat.php +++ b/actions/repeat.php @@ -47,7 +47,7 @@ class RepeatAction extends Action protected $needLogin = true; - protected function prepare($args) + protected function prepare(array $args=array()) { parent::prepare($args); diff --git a/actions/showstream.php b/actions/showstream.php index 13241dc30f..a2cd880972 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -57,7 +57,7 @@ class ShowstreamAction extends ProfileAction { var $notice; - protected function prepare($args) + protected function prepare(array $args=array()) { parent::prepare($args); diff --git a/lib/apilistusers.php b/lib/apilistusers.php index 0312510ef6..42a7bc5c99 100644 --- a/lib/apilistusers.php +++ b/lib/apilistusers.php @@ -40,7 +40,7 @@ class ApiListUsersAction extends ApiBareAuthAction var $prev_cursor = 0; var $users = null; - protected function prepare($args) + protected function prepare(array $args=array()) { // delete list member if method is DELETE or if method is POST and an argument // _method is set to DELETE diff --git a/lib/profileaction.php b/lib/profileaction.php index bf1582eeca..ea33af326a 100644 --- a/lib/profileaction.php +++ b/lib/profileaction.php @@ -53,7 +53,7 @@ class ProfileAction extends Action protected $target = null; // Profile that we're showing - protected function prepare($args) + protected function prepare(array $args=array()) { parent::prepare($args); diff --git a/plugins/Autocomplete/actions/autocomplete.php b/plugins/Autocomplete/actions/autocomplete.php index a82379c757..787ef15326 100644 --- a/plugins/Autocomplete/actions/autocomplete.php +++ b/plugins/Autocomplete/actions/autocomplete.php @@ -89,7 +89,7 @@ class AutocompleteAction extends Action $this->lastModified())) . '"'; } - protected function prepare($args) + protected function prepare(array $args=array()) { // If we die, show short error messages. StatusNet::setApi(true); diff --git a/plugins/OStatus/actions/ostatusinit.php b/plugins/OStatus/actions/ostatusinit.php index ba99a84518..e2d9c74bf2 100644 --- a/plugins/OStatus/actions/ostatusinit.php +++ b/plugins/OStatus/actions/ostatusinit.php @@ -35,7 +35,7 @@ class OStatusInitAction extends Action var $profile; var $err; - protected function prepare($args) + protected function prepare(array $args=array()) { parent::prepare($args); diff --git a/plugins/OStatus/actions/pushhub.php b/plugins/OStatus/actions/pushhub.php index c883647e68..1818a07997 100644 --- a/plugins/OStatus/actions/pushhub.php +++ b/plugins/OStatus/actions/pushhub.php @@ -47,7 +47,7 @@ class PushHubAction extends Action return parent::arg($arg, $def); } - protected function prepare($args) + protected function prepare(array $args=array()) { StatusNet::setApi(true); // reduce exception reports to aid in debugging return parent::prepare($args);