From 15643c802b25b6860f5ab0d9715ca51d9de7146b Mon Sep 17 00:00:00 2001 From: Mikael Nordfeldth Date: Sat, 6 Jun 2015 20:13:11 +0200 Subject: [PATCH 1/4] EndActionExecute event should only run if the Action is not overridden --- lib/action.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/action.php b/lib/action.php index a9cc99221d..fa91d46726 100644 --- a/lib/action.php +++ b/lib/action.php @@ -125,11 +125,10 @@ class Action extends HTMLOutputter // lawsuit } else { common_debug('Prepare failed for Action.'); } + + $this->flush(); + Event::handle('EndActionExecute', array($this)); } - - $this->flush(); - - Event::handle('EndActionExecute', array($this)); } /** From 628e7fa583df4211fdf5490be5e3b651604f1137 Mon Sep 17 00:00:00 2001 From: Mikael Nordfeldth Date: Sat, 6 Jun 2015 21:57:42 +0200 Subject: [PATCH 2/4] ApiOAuthAction functions didn't match parents --- lib/apioauthaction.php | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/lib/apioauthaction.php b/lib/apioauthaction.php index 8da7e5c61c..95a3bec45d 100644 --- a/lib/apioauthaction.php +++ b/lib/apioauthaction.php @@ -54,25 +54,10 @@ class ApiOAuthAction extends ApiAction return false; } - function prepare($args) + protected function prepare(array $args=array()) { - parent::prepare($args); - return true; - } - - /** - * Handle input, produce output - * - * Switches on request method; either shows the form or handles its input. - * - * @param array $args $_REQUEST data - * - * @return void - */ - function handle($args) - { - parent::handle($args); self::cleanRequest(); + return parent::prepare($args); } /* From 871912a00a3e627569ac65111d55b47f5d8ccedf Mon Sep 17 00:00:00 2001 From: Mikael Nordfeldth Date: Sat, 6 Jun 2015 22:04:01 +0200 Subject: [PATCH 3/4] Plugins didn't match lib/plugin.php onPluginVersion function definition I ran: for i in `grep -R onPluginVersion...version plugins/|cut -d: -f1`; do sed -i '{ s/\(onPluginVersion(\)\(\&\$versions\)/\1array \2/ }' $i; done --- lib/plugin.php | 2 +- plugins/AccountManager/AccountManagerPlugin.php | 2 +- plugins/Activity/ActivityPlugin.php | 2 +- plugins/ActivitySpam/ActivitySpamPlugin.php | 2 +- plugins/ActivityVerb/ActivityVerbPlugin.php | 2 +- plugins/AnonymousFave/AnonymousFavePlugin.php | 2 +- plugins/AntiBrute/AntiBrutePlugin.php | 2 +- plugins/ApiLogger/ApiLoggerPlugin.php | 2 +- plugins/AuthCrypt/AuthCryptPlugin.php | 2 +- plugins/AutoSandbox/AutoSandboxPlugin.php | 2 +- plugins/Autocomplete/AutocompletePlugin.php | 2 +- plugins/Awesomeness/AwesomenessPlugin.php | 2 +- plugins/BitlyUrl/BitlyUrlPlugin.php | 2 +- plugins/Blacklist/BlacklistPlugin.php | 2 +- plugins/BlankAd/BlankAdPlugin.php | 2 +- plugins/BlogspamNet/BlogspamNetPlugin.php | 2 +- plugins/Bookmark/BookmarkPlugin.php | 2 +- plugins/CacheLog/CacheLogPlugin.php | 2 +- plugins/CasAuthentication/CasAuthenticationPlugin.php | 2 +- plugins/ClientSideShorten/ClientSideShortenPlugin.php | 2 +- plugins/Comet/CometPlugin.php | 2 +- plugins/Cronish/CronishPlugin.php | 2 +- plugins/DefaultLayout/DefaultLayoutPlugin.php | 2 +- plugins/DirectionDetector/DirectionDetectorPlugin.php | 2 +- plugins/Directory/DirectoryPlugin.php | 2 +- plugins/DiskCache/DiskCachePlugin.php | 2 +- plugins/DomainStatusNetwork/DomainStatusNetworkPlugin.php | 2 +- plugins/DomainWhitelist/DomainWhitelistPlugin.php | 2 +- plugins/EmailAuthentication/EmailAuthenticationPlugin.php | 2 +- plugins/EmailRegistration/EmailRegistrationPlugin.php | 2 +- plugins/EmailReminder/EmailReminderPlugin.php | 2 +- plugins/EmailSummary/EmailSummaryPlugin.php | 2 +- plugins/Event/EventPlugin.php | 2 +- plugins/ExtendedProfile/ExtendedProfilePlugin.php | 2 +- plugins/FacebookBridge/FacebookBridgePlugin.php | 2 +- plugins/FeedPoller/FeedPollerPlugin.php | 2 +- plugins/FirePHP/FirePHPPlugin.php | 2 +- plugins/FollowEveryone/FollowEveryonePlugin.php | 2 +- plugins/ForceGroup/ForceGroupPlugin.php | 2 +- plugins/GeoURL/GeoURLPlugin.php | 2 +- plugins/Geonames/GeonamesPlugin.php | 2 +- plugins/GoogleAnalytics/GoogleAnalyticsPlugin.php | 2 +- plugins/Gravatar/GravatarPlugin.php | 2 +- plugins/GroupPrivateMessage/GroupPrivateMessagePlugin.php | 2 +- plugins/ImageMagick/ImageMagickPlugin.php | 2 +- plugins/Imap/ImapPlugin.php | 2 +- plugins/InProcessCache/InProcessCachePlugin.php | 2 +- plugins/LRDD/LRDDPlugin.php | 2 +- plugins/LdapAuthentication/LdapAuthenticationPlugin.php | 2 +- plugins/LdapAuthorization/LdapAuthorizationPlugin.php | 2 +- plugins/LilUrl/LilUrlPlugin.php | 2 +- plugins/LinkPreview/LinkPreviewPlugin.php | 2 +- plugins/Linkback/LinkbackPlugin.php | 2 +- plugins/LogFilter/LogFilterPlugin.php | 2 +- plugins/Mapstraction/MapstractionPlugin.php | 2 +- plugins/Memcache/MemcachePlugin.php | 2 +- plugins/Memcached/MemcachedPlugin.php | 2 +- plugins/Meteor/MeteorPlugin.php | 2 +- plugins/Minify/MinifyPlugin.php | 2 +- plugins/MobileProfile/MobileProfilePlugin.php | 2 +- plugins/ModHelper/ModHelperPlugin.php | 2 +- plugins/ModLog/ModLogPlugin.php | 2 +- plugins/ModPlus/ModPlusPlugin.php | 2 +- plugins/NoticeTitle/NoticeTitlePlugin.php | 2 +- plugins/OStatus/OStatusPlugin.php | 2 +- plugins/OfflineBackup/OfflineBackupPlugin.php | 2 +- plugins/OpenExternalLinkTarget/OpenExternalLinkTargetPlugin.php | 2 +- plugins/OpenID/OpenIDPlugin.php | 2 +- plugins/OpenX/OpenXPlugin.php | 2 +- plugins/OpportunisticQM/OpportunisticQMPlugin.php | 2 +- plugins/Orbited/OrbitedPlugin.php | 2 +- plugins/PiwikAnalytics/PiwikAnalyticsPlugin.php | 2 +- plugins/Poll/PollPlugin.php | 2 +- plugins/PostDebug/PostDebugPlugin.php | 2 +- plugins/PtitUrl/PtitUrlPlugin.php | 2 +- plugins/QnA/QnAPlugin.php | 2 +- plugins/RSSCloud/RSSCloudPlugin.php | 2 +- plugins/Recaptcha/RecaptchaPlugin.php | 2 +- plugins/RegisterThrottle/RegisterThrottlePlugin.php | 2 +- plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php | 2 +- .../ReverseUsernameAuthenticationPlugin.php | 2 +- plugins/SQLProfile/SQLProfilePlugin.php | 2 +- plugins/SQLStats/SQLStatsPlugin.php | 2 +- plugins/Sample/SamplePlugin.php | 2 +- plugins/SearchSub/SearchSubPlugin.php | 2 +- plugins/ShareNotice/ShareNoticePlugin.php | 2 +- plugins/SimpleUrl/SimpleUrlPlugin.php | 2 +- plugins/Sitemap/SitemapPlugin.php | 2 +- plugins/SlicedFavorites/SlicedFavoritesPlugin.php | 2 +- plugins/SphinxSearch/SphinxSearchPlugin.php | 2 +- .../StrictTransportSecurity/StrictTransportSecurityPlugin.php | 2 +- plugins/SubMirror/SubMirrorPlugin.php | 2 +- plugins/SubscriptionThrottle/SubscriptionThrottlePlugin.php | 2 +- plugins/TabFocus/TabFocusPlugin.php | 2 +- plugins/TagSub/TagSubPlugin.php | 2 +- plugins/TightUrl/TightUrlPlugin.php | 2 +- plugins/TwitterBridge/TwitterBridgePlugin.php | 2 +- plugins/UserFlag/UserFlagPlugin.php | 2 +- plugins/UserLimit/UserLimitPlugin.php | 2 +- plugins/VideoThumbnails/VideoThumbnailsPlugin.php | 2 +- plugins/WebFinger/WebFingerPlugin.php | 2 +- plugins/WikiHashtags/WikiHashtagsPlugin.php | 2 +- plugins/WikiHowProfile/WikiHowProfilePlugin.php | 2 +- plugins/Xmpp/XmppPlugin.php | 2 +- 104 files changed, 104 insertions(+), 104 deletions(-) diff --git a/lib/plugin.php b/lib/plugin.php index 94bb1e124a..28040d3f84 100644 --- a/lib/plugin.php +++ b/lib/plugin.php @@ -181,7 +181,7 @@ class Plugin . ' (' . get_class($this) . ' v' . $this->version() . ')'; } - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $name = $this->name(); diff --git a/plugins/AccountManager/AccountManagerPlugin.php b/plugins/AccountManager/AccountManagerPlugin.php index c4edce74e8..768f71510f 100644 --- a/plugins/AccountManager/AccountManagerPlugin.php +++ b/plugins/AccountManager/AccountManagerPlugin.php @@ -87,7 +87,7 @@ class AccountManagerPlugin extends Plugin } } - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'AccountManager', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/Activity/ActivityPlugin.php b/plugins/Activity/ActivityPlugin.php index 0d8508e06d..5144eb4666 100644 --- a/plugins/Activity/ActivityPlugin.php +++ b/plugins/Activity/ActivityPlugin.php @@ -339,7 +339,7 @@ class ActivityPlugin extends Plugin return true; } - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'Activity', 'version' => self::VERSION, diff --git a/plugins/ActivitySpam/ActivitySpamPlugin.php b/plugins/ActivitySpam/ActivitySpamPlugin.php index a3974b3a78..9d61b2dddd 100644 --- a/plugins/ActivitySpam/ActivitySpamPlugin.php +++ b/plugins/ActivitySpam/ActivitySpamPlugin.php @@ -215,7 +215,7 @@ class ActivitySpamPlugin extends Plugin return true; } - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'ActivitySpam', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/ActivityVerb/ActivityVerbPlugin.php b/plugins/ActivityVerb/ActivityVerbPlugin.php index dab4cb4d0b..368c2f11b7 100644 --- a/plugins/ActivityVerb/ActivityVerbPlugin.php +++ b/plugins/ActivityVerb/ActivityVerbPlugin.php @@ -44,7 +44,7 @@ class ActivityVerbPlugin extends Plugin 'verb' => '[a-z]+')); } - public function onPluginVersion(&$versions) + public function onPluginVersion(array &$versions) { $versions[] = array('name' => 'Activity Verb', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/AnonymousFave/AnonymousFavePlugin.php b/plugins/AnonymousFave/AnonymousFavePlugin.php index c817578ec2..841b652401 100644 --- a/plugins/AnonymousFave/AnonymousFavePlugin.php +++ b/plugins/AnonymousFave/AnonymousFavePlugin.php @@ -271,7 +271,7 @@ class AnonymousFavePlugin extends Plugin * * @return boolean hook value */ - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $url = 'http://status.net/wiki/Plugin:AnonymousFave'; diff --git a/plugins/AntiBrute/AntiBrutePlugin.php b/plugins/AntiBrute/AntiBrutePlugin.php index 625180d23d..c2291cbf1d 100755 --- a/plugins/AntiBrute/AntiBrutePlugin.php +++ b/plugins/AntiBrute/AntiBrutePlugin.php @@ -68,7 +68,7 @@ class AntiBrutePlugin extends Plugin { return true; } - public function onPluginVersion(&$versions) + public function onPluginVersion(array &$versions) { $versions[] = array('name' => 'AntiBrute', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/ApiLogger/ApiLoggerPlugin.php b/plugins/ApiLogger/ApiLoggerPlugin.php index ba09e35f24..920009de5a 100644 --- a/plugins/ApiLogger/ApiLoggerPlugin.php +++ b/plugins/ApiLogger/ApiLoggerPlugin.php @@ -75,7 +75,7 @@ class ApiLoggerPlugin extends Plugin return true; } - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'ApiLogger', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/AuthCrypt/AuthCryptPlugin.php b/plugins/AuthCrypt/AuthCryptPlugin.php index c99a0a4e2a..c669566772 100644 --- a/plugins/AuthCrypt/AuthCryptPlugin.php +++ b/plugins/AuthCrypt/AuthCryptPlugin.php @@ -150,7 +150,7 @@ class AuthCryptPlugin extends AuthenticationPlugin return true; } - public function onPluginVersion(&$versions) + public function onPluginVersion(array &$versions) { $versions[] = array('name' => 'AuthCrypt', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/AutoSandbox/AutoSandboxPlugin.php b/plugins/AutoSandbox/AutoSandboxPlugin.php index bffb840572..e914977cc9 100644 --- a/plugins/AutoSandbox/AutoSandboxPlugin.php +++ b/plugins/AutoSandbox/AutoSandboxPlugin.php @@ -56,7 +56,7 @@ class AutoSandboxPlugin extends Plugin } } - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'AutoSandbox', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/Autocomplete/AutocompletePlugin.php b/plugins/Autocomplete/AutocompletePlugin.php index ff56b60fc4..0f0c2592c2 100644 --- a/plugins/Autocomplete/AutocompletePlugin.php +++ b/plugins/Autocomplete/AutocompletePlugin.php @@ -52,7 +52,7 @@ class AutocompletePlugin extends Plugin $m->connect('main/autocomplete/suggest', array('action'=>'autocomplete')); } - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'Autocomplete', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/Awesomeness/AwesomenessPlugin.php b/plugins/Awesomeness/AwesomenessPlugin.php index 55a596b569..ca3b281df6 100644 --- a/plugins/Awesomeness/AwesomenessPlugin.php +++ b/plugins/Awesomeness/AwesomenessPlugin.php @@ -44,7 +44,7 @@ class AwesomenessPlugin extends Plugin { const VERSION = '0.0.42'; - public function onPluginVersion(&$versions) + public function onPluginVersion(array &$versions) { $versions[] = array( 'name' => 'Awesomeness', diff --git a/plugins/BitlyUrl/BitlyUrlPlugin.php b/plugins/BitlyUrl/BitlyUrlPlugin.php index d4d56c1be2..13a1bf2ec4 100644 --- a/plugins/BitlyUrl/BitlyUrlPlugin.php +++ b/plugins/BitlyUrl/BitlyUrlPlugin.php @@ -145,7 +145,7 @@ class BitlyUrlPlugin extends UrlShortenerPlugin return null; } - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => sprintf('BitlyUrl (%s)', $this->shortenerName), 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/Blacklist/BlacklistPlugin.php b/plugins/Blacklist/BlacklistPlugin.php index fc26cd77c6..bad89f2457 100644 --- a/plugins/Blacklist/BlacklistPlugin.php +++ b/plugins/Blacklist/BlacklistPlugin.php @@ -291,7 +291,7 @@ class BlacklistPlugin extends Plugin * * @return boolean hook value */ - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'Blacklist', 'version' => self::VERSION, diff --git a/plugins/BlankAd/BlankAdPlugin.php b/plugins/BlankAd/BlankAdPlugin.php index 49f70e68a4..b5cd968c7f 100644 --- a/plugins/BlankAd/BlankAdPlugin.php +++ b/plugins/BlankAd/BlankAdPlugin.php @@ -117,7 +117,7 @@ class BlankAdPlugin extends UAPPlugin ''); } - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'BlankAd', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/BlogspamNet/BlogspamNetPlugin.php b/plugins/BlogspamNet/BlogspamNetPlugin.php index f4de0d6c88..2cab69be30 100644 --- a/plugins/BlogspamNet/BlogspamNetPlugin.php +++ b/plugins/BlogspamNet/BlogspamNetPlugin.php @@ -148,7 +148,7 @@ class BlogspamNetPlugin extends Plugin return BLOGSPAMNETPLUGIN_VERSION; } - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'BlogspamNet', 'version' => BLOGSPAMNETPLUGIN_VERSION, diff --git a/plugins/Bookmark/BookmarkPlugin.php b/plugins/Bookmark/BookmarkPlugin.php index 3cb6d9dacb..547efa2370 100644 --- a/plugins/Bookmark/BookmarkPlugin.php +++ b/plugins/Bookmark/BookmarkPlugin.php @@ -181,7 +181,7 @@ class BookmarkPlugin extends MicroAppPlugin * * @return value */ - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'Bookmark', 'version' => self::VERSION, diff --git a/plugins/CacheLog/CacheLogPlugin.php b/plugins/CacheLog/CacheLogPlugin.php index e722972bfc..5c1b57e0e6 100644 --- a/plugins/CacheLog/CacheLogPlugin.php +++ b/plugins/CacheLog/CacheLogPlugin.php @@ -96,7 +96,7 @@ class CacheLogPlugin extends Plugin return true; } - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'CacheLog', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/CasAuthentication/CasAuthenticationPlugin.php b/plugins/CasAuthentication/CasAuthenticationPlugin.php index 2f17492a8e..461655264e 100644 --- a/plugins/CasAuthentication/CasAuthenticationPlugin.php +++ b/plugins/CasAuthentication/CasAuthenticationPlugin.php @@ -147,7 +147,7 @@ class CasAuthenticationPlugin extends AuthenticationPlugin $casSettings['takeOverLogin']=$this->takeOverLogin; } - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'CAS Authentication', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/ClientSideShorten/ClientSideShortenPlugin.php b/plugins/ClientSideShorten/ClientSideShortenPlugin.php index 0c2c9b76cc..4d87ab2240 100644 --- a/plugins/ClientSideShorten/ClientSideShortenPlugin.php +++ b/plugins/ClientSideShorten/ClientSideShortenPlugin.php @@ -54,7 +54,7 @@ class ClientSideShortenPlugin extends Plugin } } - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'Shorten', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/Comet/CometPlugin.php b/plugins/Comet/CometPlugin.php index d669626a67..5b38b2ae11 100644 --- a/plugins/Comet/CometPlugin.php +++ b/plugins/Comet/CometPlugin.php @@ -104,7 +104,7 @@ class CometPlugin extends RealtimePlugin return '/' . implode('/', $path); } - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'Comet', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/Cronish/CronishPlugin.php b/plugins/Cronish/CronishPlugin.php index 9ae62dc778..e90fa3e34c 100644 --- a/plugins/Cronish/CronishPlugin.php +++ b/plugins/Cronish/CronishPlugin.php @@ -45,7 +45,7 @@ class CronishPlugin extends Plugin { return true; } - public function onPluginVersion(&$versions) + public function onPluginVersion(array &$versions) { $versions[] = array('name' => 'Cronish', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/DefaultLayout/DefaultLayoutPlugin.php b/plugins/DefaultLayout/DefaultLayoutPlugin.php index 40823ecf9d..3c3846faf3 100644 --- a/plugins/DefaultLayout/DefaultLayoutPlugin.php +++ b/plugins/DefaultLayout/DefaultLayoutPlugin.php @@ -43,7 +43,7 @@ class DefaultLayoutPlugin extends Plugin return true; } - public function onPluginVersion(&$versions) + public function onPluginVersion(array &$versions) { $versions[] = array('name' => 'Default Layout', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/DirectionDetector/DirectionDetectorPlugin.php b/plugins/DirectionDetector/DirectionDetectorPlugin.php index 890af06807..561d38cd38 100644 --- a/plugins/DirectionDetector/DirectionDetectorPlugin.php +++ b/plugins/DirectionDetector/DirectionDetectorPlugin.php @@ -244,7 +244,7 @@ class DirectionDetectorPlugin extends Plugin { /** * plugin details */ - function onPluginVersion(&$versions){ + function onPluginVersion(array &$versions){ $url = 'http://status.net/wiki/Plugin:DirectionDetector'; $versions[] = array( diff --git a/plugins/Directory/DirectoryPlugin.php b/plugins/Directory/DirectoryPlugin.php index 7ac0f93265..cae94e3427 100644 --- a/plugins/Directory/DirectoryPlugin.php +++ b/plugins/Directory/DirectoryPlugin.php @@ -251,7 +251,7 @@ class DirectoryPlugin extends Plugin /* * Version info */ - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array( 'name' => 'Directory', diff --git a/plugins/DiskCache/DiskCachePlugin.php b/plugins/DiskCache/DiskCachePlugin.php index 5d23d45f59..967990c12f 100644 --- a/plugins/DiskCache/DiskCachePlugin.php +++ b/plugins/DiskCache/DiskCachePlugin.php @@ -161,7 +161,7 @@ class DiskCachePlugin extends Plugin return false; } - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'DiskCache', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/DomainStatusNetwork/DomainStatusNetworkPlugin.php b/plugins/DomainStatusNetwork/DomainStatusNetworkPlugin.php index d0e1ea7d76..062151db17 100644 --- a/plugins/DomainStatusNetwork/DomainStatusNetworkPlugin.php +++ b/plugins/DomainStatusNetwork/DomainStatusNetworkPlugin.php @@ -190,7 +190,7 @@ class DomainStatusNetworkPlugin extends Plugin return null; } - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'DomainStatusNetwork', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/DomainWhitelist/DomainWhitelistPlugin.php b/plugins/DomainWhitelist/DomainWhitelistPlugin.php index 20073a07c4..2e15dd809a 100644 --- a/plugins/DomainWhitelist/DomainWhitelistPlugin.php +++ b/plugins/DomainWhitelist/DomainWhitelistPlugin.php @@ -267,7 +267,7 @@ class DomainWhitelistPlugin extends Plugin return true; } - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'DomainWhitelist', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/EmailAuthentication/EmailAuthenticationPlugin.php b/plugins/EmailAuthentication/EmailAuthenticationPlugin.php index a17748fe32..524f1a6411 100644 --- a/plugins/EmailAuthentication/EmailAuthenticationPlugin.php +++ b/plugins/EmailAuthentication/EmailAuthenticationPlugin.php @@ -49,7 +49,7 @@ class EmailAuthenticationPlugin extends Plugin return true; } - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'Email Authentication', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/EmailRegistration/EmailRegistrationPlugin.php b/plugins/EmailRegistration/EmailRegistrationPlugin.php index 741f24305b..9e0fd58856 100644 --- a/plugins/EmailRegistration/EmailRegistrationPlugin.php +++ b/plugins/EmailRegistration/EmailRegistrationPlugin.php @@ -172,7 +172,7 @@ class EmailRegistrationPlugin extends Plugin return true; } - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'EmailRegistration', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/EmailReminder/EmailReminderPlugin.php b/plugins/EmailReminder/EmailReminderPlugin.php index 51950542b2..9ac6275537 100644 --- a/plugins/EmailReminder/EmailReminderPlugin.php +++ b/plugins/EmailReminder/EmailReminderPlugin.php @@ -179,7 +179,7 @@ class EmailReminderPlugin extends Plugin * @param type $versions * @return type */ - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array( 'name' => 'EmailReminder', diff --git a/plugins/EmailSummary/EmailSummaryPlugin.php b/plugins/EmailSummary/EmailSummaryPlugin.php index da682e0454..bc47fdece9 100644 --- a/plugins/EmailSummary/EmailSummaryPlugin.php +++ b/plugins/EmailSummary/EmailSummaryPlugin.php @@ -66,7 +66,7 @@ class EmailSummaryPlugin extends Plugin * * @return boolean hook value; true means continue processing, false means stop. */ - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'EmailSummary', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/Event/EventPlugin.php b/plugins/Event/EventPlugin.php index 8d661bbd85..9fa6e17fc3 100644 --- a/plugins/Event/EventPlugin.php +++ b/plugins/Event/EventPlugin.php @@ -90,7 +90,7 @@ class EventPlugin extends MicroAppPlugin return true; } - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'Event', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/ExtendedProfile/ExtendedProfilePlugin.php b/plugins/ExtendedProfile/ExtendedProfilePlugin.php index a5cd823bb7..ea928b995e 100644 --- a/plugins/ExtendedProfile/ExtendedProfilePlugin.php +++ b/plugins/ExtendedProfile/ExtendedProfilePlugin.php @@ -29,7 +29,7 @@ if (!defined('STATUSNET')) { */ class ExtendedProfilePlugin extends Plugin { - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array( 'name' => 'ExtendedProfile', diff --git a/plugins/FacebookBridge/FacebookBridgePlugin.php b/plugins/FacebookBridge/FacebookBridgePlugin.php index fff5a7621b..a19cc0349b 100644 --- a/plugins/FacebookBridge/FacebookBridgePlugin.php +++ b/plugins/FacebookBridge/FacebookBridgePlugin.php @@ -612,7 +612,7 @@ ENDOFSCRIPT; * * @param array &$versions plugin version descriptions */ - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array( 'name' => 'Facebook Bridge', diff --git a/plugins/FeedPoller/FeedPollerPlugin.php b/plugins/FeedPoller/FeedPollerPlugin.php index c844d99c1b..e272c0b705 100644 --- a/plugins/FeedPoller/FeedPollerPlugin.php +++ b/plugins/FeedPoller/FeedPollerPlugin.php @@ -47,7 +47,7 @@ class FeedPollerPlugin extends Plugin { return true; } - public function onPluginVersion(&$versions) + public function onPluginVersion(array &$versions) { $versions[] = array('name' => 'FeedPoller', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/FirePHP/FirePHPPlugin.php b/plugins/FirePHP/FirePHPPlugin.php index b6d3773c20..f884cd9c69 100644 --- a/plugins/FirePHP/FirePHPPlugin.php +++ b/plugins/FirePHP/FirePHPPlugin.php @@ -58,7 +58,7 @@ class FirePHPPlugin extends Plugin $this->firephp->fb($msg, $fp_priority); } - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'FirePHP', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/FollowEveryone/FollowEveryonePlugin.php b/plugins/FollowEveryone/FollowEveryonePlugin.php index ee38c7a311..3c26963e3e 100644 --- a/plugins/FollowEveryone/FollowEveryonePlugin.php +++ b/plugins/FollowEveryone/FollowEveryonePlugin.php @@ -165,7 +165,7 @@ class FollowEveryonePlugin extends Plugin * @return boolean hook value * */ - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'FollowEveryone', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/ForceGroup/ForceGroupPlugin.php b/plugins/ForceGroup/ForceGroupPlugin.php index a79c9d312b..56e33355e8 100644 --- a/plugins/ForceGroup/ForceGroupPlugin.php +++ b/plugins/ForceGroup/ForceGroupPlugin.php @@ -105,7 +105,7 @@ class ForceGroupPlugin extends Plugin * * @return boolean hook value */ - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $url = 'http://status.net/wiki/Plugin:ForceGroup'; diff --git a/plugins/GeoURL/GeoURLPlugin.php b/plugins/GeoURL/GeoURLPlugin.php index d548de925a..caad8fde11 100644 --- a/plugins/GeoURL/GeoURLPlugin.php +++ b/plugins/GeoURL/GeoURLPlugin.php @@ -114,7 +114,7 @@ class GeoURLPlugin extends Plugin return true; } - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'GeoURL', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/Geonames/GeonamesPlugin.php b/plugins/Geonames/GeonamesPlugin.php index 68d66bc0b1..ff9192283f 100644 --- a/plugins/Geonames/GeonamesPlugin.php +++ b/plugins/Geonames/GeonamesPlugin.php @@ -487,7 +487,7 @@ class GeonamesPlugin extends Plugin return $document->geoname; } - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'Geonames', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/GoogleAnalytics/GoogleAnalyticsPlugin.php b/plugins/GoogleAnalytics/GoogleAnalyticsPlugin.php index 640330b850..1dc0f0f07a 100644 --- a/plugins/GoogleAnalytics/GoogleAnalyticsPlugin.php +++ b/plugins/GoogleAnalytics/GoogleAnalyticsPlugin.php @@ -105,7 +105,7 @@ ENDOFSCRIPT2; $action->inlineScript($js); } - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'GoogleAnalytics', 'version' => self::VERSION, diff --git a/plugins/Gravatar/GravatarPlugin.php b/plugins/Gravatar/GravatarPlugin.php index d716398889..cf9e3a01fe 100644 --- a/plugins/Gravatar/GravatarPlugin.php +++ b/plugins/Gravatar/GravatarPlugin.php @@ -59,7 +59,7 @@ class GravatarPlugin extends Plugin return $url; } - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'Gravatar', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/GroupPrivateMessage/GroupPrivateMessagePlugin.php b/plugins/GroupPrivateMessage/GroupPrivateMessagePlugin.php index 73d7201e6f..61828239ca 100644 --- a/plugins/GroupPrivateMessage/GroupPrivateMessagePlugin.php +++ b/plugins/GroupPrivateMessage/GroupPrivateMessagePlugin.php @@ -405,7 +405,7 @@ class GroupPrivateMessagePlugin extends Plugin return true; } - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'GroupPrivateMessage', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/ImageMagick/ImageMagickPlugin.php b/plugins/ImageMagick/ImageMagickPlugin.php index 6e238ee8f2..927445211c 100644 --- a/plugins/ImageMagick/ImageMagickPlugin.php +++ b/plugins/ImageMagick/ImageMagickPlugin.php @@ -132,7 +132,7 @@ class ImageMagickPlugin extends Plugin return getimagesize($outpath); // Verify that we wrote an understandable image. } - public function onPluginVersion(&$versions) + public function onPluginVersion(array &$versions) { $versions[] = array('name' => 'ImageMagick', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/Imap/ImapPlugin.php b/plugins/Imap/ImapPlugin.php index 5711951e26..ea6eaabef8 100644 --- a/plugins/Imap/ImapPlugin.php +++ b/plugins/Imap/ImapPlugin.php @@ -76,7 +76,7 @@ class ImapPlugin extends Plugin $classes[] = new ImapManager($this); } - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'IMAP', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/InProcessCache/InProcessCachePlugin.php b/plugins/InProcessCache/InProcessCachePlugin.php index af3d822dfd..4684d0169f 100644 --- a/plugins/InProcessCache/InProcessCachePlugin.php +++ b/plugins/InProcessCache/InProcessCachePlugin.php @@ -170,7 +170,7 @@ class InProcessCachePlugin extends Plugin * * @return boolean true */ - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $url = 'http://status.net/wiki/Plugin:InProcessCache'; diff --git a/plugins/LRDD/LRDDPlugin.php b/plugins/LRDD/LRDDPlugin.php index e8bf82ec31..16eee335a3 100644 --- a/plugins/LRDD/LRDDPlugin.php +++ b/plugins/LRDD/LRDDPlugin.php @@ -51,7 +51,7 @@ class LRDDPlugin extends Plugin $disco->registerMethod('LRDDMethod_LinkHTML'); } - public function onPluginVersion(&$versions) + public function onPluginVersion(array &$versions) { $versions[] = array('name' => 'LRDD', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/LdapAuthentication/LdapAuthenticationPlugin.php b/plugins/LdapAuthentication/LdapAuthenticationPlugin.php index df28c5a09f..0efaec99b2 100644 --- a/plugins/LdapAuthentication/LdapAuthenticationPlugin.php +++ b/plugins/LdapAuthentication/LdapAuthenticationPlugin.php @@ -142,7 +142,7 @@ class LdapAuthenticationPlugin extends AuthenticationPlugin return common_nicknamize($nickname); } - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'LDAP Authentication', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/LdapAuthorization/LdapAuthorizationPlugin.php b/plugins/LdapAuthorization/LdapAuthorizationPlugin.php index 9a666d1551..eca8e037a0 100644 --- a/plugins/LdapAuthorization/LdapAuthorizationPlugin.php +++ b/plugins/LdapAuthorization/LdapAuthorizationPlugin.php @@ -118,7 +118,7 @@ class LdapAuthorizationPlugin extends AuthorizationPlugin return false; } - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'LDAP Authorization', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/LilUrl/LilUrlPlugin.php b/plugins/LilUrl/LilUrlPlugin.php index f871a95630..fcbee2b56d 100644 --- a/plugins/LilUrl/LilUrlPlugin.php +++ b/plugins/LilUrl/LilUrlPlugin.php @@ -57,7 +57,7 @@ class LilUrlPlugin extends UrlShortenerPlugin } } - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => sprintf('LilUrl (%s)', $this->shortenerName), 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/LinkPreview/LinkPreviewPlugin.php b/plugins/LinkPreview/LinkPreviewPlugin.php index effb105e2b..5edf66767d 100644 --- a/plugins/LinkPreview/LinkPreviewPlugin.php +++ b/plugins/LinkPreview/LinkPreviewPlugin.php @@ -29,7 +29,7 @@ if (!defined('STATUSNET')) { */ class LinkPreviewPlugin extends Plugin { - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'LinkPreview', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/Linkback/LinkbackPlugin.php b/plugins/Linkback/LinkbackPlugin.php index 597ac1f446..a710abd7bf 100644 --- a/plugins/Linkback/LinkbackPlugin.php +++ b/plugins/Linkback/LinkbackPlugin.php @@ -232,7 +232,7 @@ class LinkbackPlugin extends Plugin return LINKBACKPLUGIN_VERSION; } - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'Linkback', 'version' => LINKBACKPLUGIN_VERSION, diff --git a/plugins/LogFilter/LogFilterPlugin.php b/plugins/LogFilter/LogFilterPlugin.php index 430e89594e..028af9bc9c 100644 --- a/plugins/LogFilter/LogFilterPlugin.php +++ b/plugins/LogFilter/LogFilterPlugin.php @@ -39,7 +39,7 @@ class LogFilterPlugin extends Plugin public $priority = array(); // override by priority: array(LOG_ERR => true, LOG_DEBUG => false) public $regex = array(); // override by regex match of message: array('/twitter/i' => false) - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'LogFilter', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/Mapstraction/MapstractionPlugin.php b/plugins/Mapstraction/MapstractionPlugin.php index 1e0d05f8ad..fcc9d88e56 100644 --- a/plugins/Mapstraction/MapstractionPlugin.php +++ b/plugins/Mapstraction/MapstractionPlugin.php @@ -169,7 +169,7 @@ class MapstractionPlugin extends Plugin $action->elementEnd('div'); } - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'Mapstraction', 'version' => self::VERSION, diff --git a/plugins/Memcache/MemcachePlugin.php b/plugins/Memcache/MemcachePlugin.php index 8e674e62b8..7efb5e0284 100644 --- a/plugins/Memcache/MemcachePlugin.php +++ b/plugins/Memcache/MemcachePlugin.php @@ -236,7 +236,7 @@ class MemcachePlugin extends Plugin return $out; } - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'Memcache', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/Memcached/MemcachedPlugin.php b/plugins/Memcached/MemcachedPlugin.php index 55c21cd923..ca24b7b7d1 100644 --- a/plugins/Memcached/MemcachedPlugin.php +++ b/plugins/Memcached/MemcachedPlugin.php @@ -207,7 +207,7 @@ class MemcachedPlugin extends Plugin return $flag; } - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'Memcached', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/Meteor/MeteorPlugin.php b/plugins/Meteor/MeteorPlugin.php index d2341980d2..64c2fd3d69 100644 --- a/plugins/Meteor/MeteorPlugin.php +++ b/plugins/Meteor/MeteorPlugin.php @@ -160,7 +160,7 @@ class MeteorPlugin extends RealtimePlugin return implode('-', $path); } - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'Meteor', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/Minify/MinifyPlugin.php b/plugins/Minify/MinifyPlugin.php index 1e13f8d801..1dd3bdcf34 100644 --- a/plugins/Minify/MinifyPlugin.php +++ b/plugins/Minify/MinifyPlugin.php @@ -157,7 +157,7 @@ class MinifyPlugin extends Plugin return Minify_CSS::minify($code,$options); } - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'Minify', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/MobileProfile/MobileProfilePlugin.php b/plugins/MobileProfile/MobileProfilePlugin.php index 2efc006879..4129035ebb 100644 --- a/plugins/MobileProfile/MobileProfilePlugin.php +++ b/plugins/MobileProfile/MobileProfilePlugin.php @@ -368,7 +368,7 @@ class MobileProfilePlugin extends WAP20Plugin return $proto.'://'.$serverpart.'/'.$pathpart.$relative; } - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'MobileProfile', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/ModHelper/ModHelperPlugin.php b/plugins/ModHelper/ModHelperPlugin.php index 4b4bf8f447..2752a21539 100644 --- a/plugins/ModHelper/ModHelperPlugin.php +++ b/plugins/ModHelper/ModHelperPlugin.php @@ -29,7 +29,7 @@ class ModHelperPlugin extends Plugin { static $rights = array(Right::SILENCEUSER, Right::TRAINSPAM, Right::REVIEWSPAM); - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'ModHelper', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/ModLog/ModLogPlugin.php b/plugins/ModLog/ModLogPlugin.php index bbf283f8c4..32c96be0e8 100644 --- a/plugins/ModLog/ModLogPlugin.php +++ b/plugins/ModLog/ModLogPlugin.php @@ -183,7 +183,7 @@ class ModLogPlugin extends Plugin } } - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'ModLog', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/ModPlus/ModPlusPlugin.php b/plugins/ModPlus/ModPlusPlugin.php index 2e1077c225..816034f831 100644 --- a/plugins/ModPlus/ModPlusPlugin.php +++ b/plugins/ModPlus/ModPlusPlugin.php @@ -27,7 +27,7 @@ if (!defined('GNUSOCIAL')) { exit(1); } */ class ModPlusPlugin extends Plugin { - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'ModPlus', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/NoticeTitle/NoticeTitlePlugin.php b/plugins/NoticeTitle/NoticeTitlePlugin.php index 1b910cc408..960cb935f7 100644 --- a/plugins/NoticeTitle/NoticeTitlePlugin.php +++ b/plugins/NoticeTitle/NoticeTitlePlugin.php @@ -84,7 +84,7 @@ class NoticeTitlePlugin extends Plugin * * @return boolean hook value */ - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $url = 'http://status.net/wiki/Plugin:NoticeTitle'; diff --git a/plugins/OStatus/OStatusPlugin.php b/plugins/OStatus/OStatusPlugin.php index 7730f2e67c..630031fdde 100644 --- a/plugins/OStatus/OStatusPlugin.php +++ b/plugins/OStatus/OStatusPlugin.php @@ -1166,7 +1166,7 @@ class OStatusPlugin extends Plugin return true; } - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'OStatus', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/OfflineBackup/OfflineBackupPlugin.php b/plugins/OfflineBackup/OfflineBackupPlugin.php index a2e3d8c49b..1d7a17ca2c 100644 --- a/plugins/OfflineBackup/OfflineBackupPlugin.php +++ b/plugins/OfflineBackup/OfflineBackupPlugin.php @@ -71,7 +71,7 @@ class OfflineBackupPlugin extends Plugin return true; } - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'OfflineBackup', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/OpenExternalLinkTarget/OpenExternalLinkTargetPlugin.php b/plugins/OpenExternalLinkTarget/OpenExternalLinkTargetPlugin.php index d5b9dfa0da..06c75f7a93 100644 --- a/plugins/OpenExternalLinkTarget/OpenExternalLinkTargetPlugin.php +++ b/plugins/OpenExternalLinkTarget/OpenExternalLinkTargetPlugin.php @@ -49,7 +49,7 @@ class OpenExternalLinkTargetPlugin extends Plugin return true; } - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'OpenExternalLinkTarget', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/OpenID/OpenIDPlugin.php b/plugins/OpenID/OpenIDPlugin.php index 3ba2f4e5ab..710a34410a 100644 --- a/plugins/OpenID/OpenIDPlugin.php +++ b/plugins/OpenID/OpenIDPlugin.php @@ -615,7 +615,7 @@ class OpenIDPlugin extends Plugin * * @return boolean hook value */ - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'OpenID', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/OpenX/OpenXPlugin.php b/plugins/OpenX/OpenXPlugin.php index 6385d82102..8d80197be3 100644 --- a/plugins/OpenX/OpenXPlugin.php +++ b/plugins/OpenX/OpenXPlugin.php @@ -199,7 +199,7 @@ ENDOFSCRIPT; * * @return boolean hook value */ - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'OpenX', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/OpportunisticQM/OpportunisticQMPlugin.php b/plugins/OpportunisticQM/OpportunisticQMPlugin.php index 2e57cae9d1..0b57fb4ccc 100644 --- a/plugins/OpportunisticQM/OpportunisticQMPlugin.php +++ b/plugins/OpportunisticQM/OpportunisticQMPlugin.php @@ -32,7 +32,7 @@ class OpportunisticQMPlugin extends Plugin { return true; } - public function onPluginVersion(&$versions) + public function onPluginVersion(array &$versions) { $versions[] = array('name' => 'OpportunisticQM', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/Orbited/OrbitedPlugin.php b/plugins/Orbited/OrbitedPlugin.php index e788c464e6..5abd27e9ee 100644 --- a/plugins/Orbited/OrbitedPlugin.php +++ b/plugins/Orbited/OrbitedPlugin.php @@ -159,7 +159,7 @@ class OrbitedPlugin extends RealtimePlugin * * @return boolean hook value */ - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'Orbited', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/PiwikAnalytics/PiwikAnalyticsPlugin.php b/plugins/PiwikAnalytics/PiwikAnalyticsPlugin.php index 7b8be7900f..fa5894a8f5 100644 --- a/plugins/PiwikAnalytics/PiwikAnalyticsPlugin.php +++ b/plugins/PiwikAnalytics/PiwikAnalyticsPlugin.php @@ -103,7 +103,7 @@ ENDOFPIWIK; return true; } - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'PiwikAnalytics', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/Poll/PollPlugin.php b/plugins/Poll/PollPlugin.php index 92886dcc28..53a491ef47 100644 --- a/plugins/Poll/PollPlugin.php +++ b/plugins/Poll/PollPlugin.php @@ -120,7 +120,7 @@ class PollPlugin extends MicroAppPlugin * * @return value */ - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'Poll', 'version' => self::VERSION, diff --git a/plugins/PostDebug/PostDebugPlugin.php b/plugins/PostDebug/PostDebugPlugin.php index 3b4ccd272b..120feee8fe 100644 --- a/plugins/PostDebug/PostDebugPlugin.php +++ b/plugins/PostDebug/PostDebugPlugin.php @@ -48,7 +48,7 @@ class PostDebugPlugin extends Plugin } } - public function onPluginVersion(&$versions) + public function onPluginVersion(array &$versions) { $versions[] = array('name' => 'PostDebug', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/PtitUrl/PtitUrlPlugin.php b/plugins/PtitUrl/PtitUrlPlugin.php index 7696333145..0e23a5f64e 100644 --- a/plugins/PtitUrl/PtitUrlPlugin.php +++ b/plugins/PtitUrl/PtitUrlPlugin.php @@ -57,7 +57,7 @@ class PtitUrlPlugin extends UrlShortenerPlugin } } - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => sprintf('PtitUrl (%s)', $this->shortenerName), 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/QnA/QnAPlugin.php b/plugins/QnA/QnAPlugin.php index a476c2af56..f64cd905cf 100644 --- a/plugins/QnA/QnAPlugin.php +++ b/plugins/QnA/QnAPlugin.php @@ -124,7 +124,7 @@ class QnAPlugin extends MicroAppPlugin return true; } - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array( 'name' => 'QnA', diff --git a/plugins/RSSCloud/RSSCloudPlugin.php b/plugins/RSSCloud/RSSCloudPlugin.php index 55f73783fa..0fff0947a2 100644 --- a/plugins/RSSCloud/RSSCloudPlugin.php +++ b/plugins/RSSCloud/RSSCloudPlugin.php @@ -198,7 +198,7 @@ class RSSCloudPlugin extends Plugin return true; } - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'RSSCloud', 'version' => RSSCLOUDPLUGIN_VERSION, diff --git a/plugins/Recaptcha/RecaptchaPlugin.php b/plugins/Recaptcha/RecaptchaPlugin.php index 946c604e65..c039dd5350 100644 --- a/plugins/Recaptcha/RecaptchaPlugin.php +++ b/plugins/Recaptcha/RecaptchaPlugin.php @@ -104,7 +104,7 @@ class RecaptchaPlugin extends Plugin } } - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'Recaptcha', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/RegisterThrottle/RegisterThrottlePlugin.php b/plugins/RegisterThrottle/RegisterThrottlePlugin.php index dbff2bace8..9d3be3b8a2 100644 --- a/plugins/RegisterThrottle/RegisterThrottlePlugin.php +++ b/plugins/RegisterThrottle/RegisterThrottlePlugin.php @@ -175,7 +175,7 @@ class RegisterThrottlePlugin extends Plugin * * @return boolean hook value */ - public function onPluginVersion(&$versions) + public function onPluginVersion(array &$versions) { $versions[] = array('name' => 'RegisterThrottle', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php b/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php index f7e17f80c8..a37a3918f6 100644 --- a/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php +++ b/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php @@ -209,7 +209,7 @@ class RequireValidatedEmailPlugin extends Plugin * * @return boolean hook value */ - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'Require Validated Email', diff --git a/plugins/ReverseUsernameAuthentication/ReverseUsernameAuthenticationPlugin.php b/plugins/ReverseUsernameAuthentication/ReverseUsernameAuthenticationPlugin.php index 959648bc89..9a85a974ae 100644 --- a/plugins/ReverseUsernameAuthentication/ReverseUsernameAuthenticationPlugin.php +++ b/plugins/ReverseUsernameAuthentication/ReverseUsernameAuthenticationPlugin.php @@ -57,7 +57,7 @@ class ReverseUsernameAuthenticationPlugin extends AuthenticationPlugin return User::register($registration_data); } - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'Reverse Username Authentication', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/SQLProfile/SQLProfilePlugin.php b/plugins/SQLProfile/SQLProfilePlugin.php index a29a7f5bea..a7912844c2 100644 --- a/plugins/SQLProfile/SQLProfilePlugin.php +++ b/plugins/SQLProfile/SQLProfilePlugin.php @@ -31,7 +31,7 @@ class SQLProfilePlugin extends Plugin { private $recursionGuard = false; - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'SQLProfile', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/SQLStats/SQLStatsPlugin.php b/plugins/SQLStats/SQLStatsPlugin.php index b20f72be42..f67ed03012 100644 --- a/plugins/SQLStats/SQLStatsPlugin.php +++ b/plugins/SQLStats/SQLStatsPlugin.php @@ -34,7 +34,7 @@ class SQLStatsPlugin extends Plugin protected $queryTimes = array(); protected $queries = array(); - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'SQLStats', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/Sample/SamplePlugin.php b/plugins/Sample/SamplePlugin.php index 8758013a41..80c46d17c4 100644 --- a/plugins/Sample/SamplePlugin.php +++ b/plugins/Sample/SamplePlugin.php @@ -222,7 +222,7 @@ class SamplePlugin extends Plugin return true; } - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'Sample', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/SearchSub/SearchSubPlugin.php b/plugins/SearchSub/SearchSubPlugin.php index dc7ff7b19a..57984d0e01 100644 --- a/plugins/SearchSub/SearchSubPlugin.php +++ b/plugins/SearchSub/SearchSubPlugin.php @@ -88,7 +88,7 @@ class SearchSubPlugin extends Plugin * * @return value */ - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'SearchSub', 'version' => self::VERSION, diff --git a/plugins/ShareNotice/ShareNoticePlugin.php b/plugins/ShareNotice/ShareNoticePlugin.php index bb09b94605..7a6fd28fee 100644 --- a/plugins/ShareNotice/ShareNoticePlugin.php +++ b/plugins/ShareNotice/ShareNoticePlugin.php @@ -209,7 +209,7 @@ class FacebookShareTarget extends NoticeShareTarget * * @return boolean hook value */ - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $url = 'http://status.net/wiki/Plugin:ShareNotice'; diff --git a/plugins/SimpleUrl/SimpleUrlPlugin.php b/plugins/SimpleUrl/SimpleUrlPlugin.php index 574b466df6..41e1998483 100644 --- a/plugins/SimpleUrl/SimpleUrlPlugin.php +++ b/plugins/SimpleUrl/SimpleUrlPlugin.php @@ -47,7 +47,7 @@ class SimpleUrlPlugin extends UrlShortenerPlugin return $this->http_get(sprintf($this->serviceUrl,urlencode($url))); } - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => sprintf('SimpleUrl (%s)', $this->shortenerName), 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/Sitemap/SitemapPlugin.php b/plugins/Sitemap/SitemapPlugin.php index 3d83629bb2..a1fe90b4b4 100644 --- a/plugins/Sitemap/SitemapPlugin.php +++ b/plugins/Sitemap/SitemapPlugin.php @@ -174,7 +174,7 @@ class SitemapPlugin extends Plugin * * @return boolean hook value */ - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $url = 'http://status.net/wiki/Plugin:Sitemap'; diff --git a/plugins/SlicedFavorites/SlicedFavoritesPlugin.php b/plugins/SlicedFavorites/SlicedFavoritesPlugin.php index 92d1f55c3f..4e1129536d 100644 --- a/plugins/SlicedFavorites/SlicedFavoritesPlugin.php +++ b/plugins/SlicedFavorites/SlicedFavoritesPlugin.php @@ -95,7 +95,7 @@ class SlicedFavoritesPlugin extends Plugin * * @return boolean hook value */ - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $url = 'http://status.net/wiki/Plugin:SlicedFavorites'; diff --git a/plugins/SphinxSearch/SphinxSearchPlugin.php b/plugins/SphinxSearch/SphinxSearchPlugin.php index be7fc95368..74744f18e6 100644 --- a/plugins/SphinxSearch/SphinxSearchPlugin.php +++ b/plugins/SphinxSearch/SphinxSearchPlugin.php @@ -105,7 +105,7 @@ class SphinxSearchPlugin extends Plugin * * @return boolean hook value */ - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $url = 'http://status.net/wiki/Plugin:SphinxSearch'; diff --git a/plugins/StrictTransportSecurity/StrictTransportSecurityPlugin.php b/plugins/StrictTransportSecurity/StrictTransportSecurityPlugin.php index 675642135c..74a643d6d9 100644 --- a/plugins/StrictTransportSecurity/StrictTransportSecurityPlugin.php +++ b/plugins/StrictTransportSecurity/StrictTransportSecurityPlugin.php @@ -50,7 +50,7 @@ class StrictTransportSecurityPlugin extends Plugin } } - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'StrictTransportSecurity', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/SubMirror/SubMirrorPlugin.php b/plugins/SubMirror/SubMirrorPlugin.php index a21cb43551..27fc7c984d 100644 --- a/plugins/SubMirror/SubMirrorPlugin.php +++ b/plugins/SubMirror/SubMirrorPlugin.php @@ -57,7 +57,7 @@ class SubMirrorPlugin extends Plugin } } - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'SubMirror', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/SubscriptionThrottle/SubscriptionThrottlePlugin.php b/plugins/SubscriptionThrottle/SubscriptionThrottlePlugin.php index b19a03d11c..fec91afdb7 100644 --- a/plugins/SubscriptionThrottle/SubscriptionThrottlePlugin.php +++ b/plugins/SubscriptionThrottle/SubscriptionThrottlePlugin.php @@ -157,7 +157,7 @@ class SubscriptionThrottlePlugin extends Plugin * * @return boolean hook value */ - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'SubscriptionThrottle', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/TabFocus/TabFocusPlugin.php b/plugins/TabFocus/TabFocusPlugin.php index 0dd7a902ef..df69298888 100644 --- a/plugins/TabFocus/TabFocusPlugin.php +++ b/plugins/TabFocus/TabFocusPlugin.php @@ -44,7 +44,7 @@ class TabFocusPlugin extends Plugin $action->script($this->path('tabfocus.js')); } - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'TabFocus', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/TagSub/TagSubPlugin.php b/plugins/TagSub/TagSubPlugin.php index ef58553d2e..f1d1ab4622 100644 --- a/plugins/TagSub/TagSubPlugin.php +++ b/plugins/TagSub/TagSubPlugin.php @@ -89,7 +89,7 @@ class TagSubPlugin extends Plugin * * @return value */ - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'TagSub', 'version' => self::VERSION, diff --git a/plugins/TightUrl/TightUrlPlugin.php b/plugins/TightUrl/TightUrlPlugin.php index d9414a8e8c..52e5184392 100644 --- a/plugins/TightUrl/TightUrlPlugin.php +++ b/plugins/TightUrl/TightUrlPlugin.php @@ -57,7 +57,7 @@ class TightUrlPlugin extends UrlShortenerPlugin } } - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => sprintf('TightUrl (%s)', $this->shortenerName), 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/TwitterBridge/TwitterBridgePlugin.php b/plugins/TwitterBridge/TwitterBridgePlugin.php index 643591cf77..9b129ea21b 100644 --- a/plugins/TwitterBridge/TwitterBridgePlugin.php +++ b/plugins/TwitterBridge/TwitterBridgePlugin.php @@ -297,7 +297,7 @@ class TwitterBridgePlugin extends Plugin * * @return boolean hook value */ - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array( 'name' => 'TwitterBridge', diff --git a/plugins/UserFlag/UserFlagPlugin.php b/plugins/UserFlag/UserFlagPlugin.php index a5fc470e07..d2afeaced8 100644 --- a/plugins/UserFlag/UserFlagPlugin.php +++ b/plugins/UserFlag/UserFlagPlugin.php @@ -227,7 +227,7 @@ class UserFlagPlugin extends Plugin * * @return boolean hook value */ - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $url = 'http://status.net/wiki/Plugin:UserFlag'; diff --git a/plugins/UserLimit/UserLimitPlugin.php b/plugins/UserLimit/UserLimitPlugin.php index f881e9006a..ac4d503151 100644 --- a/plugins/UserLimit/UserLimitPlugin.php +++ b/plugins/UserLimit/UserLimitPlugin.php @@ -81,7 +81,7 @@ class UserLimitPlugin extends Plugin } } - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'UserLimit', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/VideoThumbnails/VideoThumbnailsPlugin.php b/plugins/VideoThumbnails/VideoThumbnailsPlugin.php index 23af7e00ac..32ce37c1cf 100644 --- a/plugins/VideoThumbnails/VideoThumbnailsPlugin.php +++ b/plugins/VideoThumbnails/VideoThumbnailsPlugin.php @@ -69,7 +69,7 @@ class VideoThumbnailsPlugin extends Plugin return false; } - public function onPluginVersion(&$versions) + public function onPluginVersion(array &$versions) { $versions[] = array('name' => 'Video Thumbnails', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/WebFinger/WebFingerPlugin.php b/plugins/WebFinger/WebFingerPlugin.php index 6f8ec9397d..91dc9b53f7 100644 --- a/plugins/WebFinger/WebFingerPlugin.php +++ b/plugins/WebFinger/WebFingerPlugin.php @@ -153,7 +153,7 @@ class WebFingerPlugin extends Plugin } } - public function onPluginVersion(&$versions) + public function onPluginVersion(array &$versions) { $versions[] = array('name' => 'WebFinger', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/WikiHashtags/WikiHashtagsPlugin.php b/plugins/WikiHashtags/WikiHashtagsPlugin.php index f0baa597ce..db33eb801a 100644 --- a/plugins/WikiHashtags/WikiHashtagsPlugin.php +++ b/plugins/WikiHashtags/WikiHashtagsPlugin.php @@ -104,7 +104,7 @@ class WikiHashtagsPlugin extends Plugin return true; } - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'WikiHashtags', 'version' => self::VERSION, diff --git a/plugins/WikiHowProfile/WikiHowProfilePlugin.php b/plugins/WikiHowProfile/WikiHowProfilePlugin.php index b058cc3b65..8656272e48 100644 --- a/plugins/WikiHowProfile/WikiHowProfilePlugin.php +++ b/plugins/WikiHowProfile/WikiHowProfilePlugin.php @@ -49,7 +49,7 @@ if (!defined('STATUSNET')) { */ class WikiHowProfilePlugin extends Plugin { - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'WikiHow avatar fetcher', 'version' => GNUSOCIAL_VERSION, diff --git a/plugins/Xmpp/XmppPlugin.php b/plugins/Xmpp/XmppPlugin.php index d95ffcf0d6..0a70268735 100644 --- a/plugins/Xmpp/XmppPlugin.php +++ b/plugins/Xmpp/XmppPlugin.php @@ -462,7 +462,7 @@ class XmppPlugin extends ImPlugin } - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array('name' => 'XMPP', 'version' => GNUSOCIAL_VERSION, From d76d37340a64d370bfdfd439b4dc9f700e680bf0 Mon Sep 17 00:00:00 2001 From: Mikael Nordfeldth Date: Sat, 6 Jun 2015 22:14:56 +0200 Subject: [PATCH 4/4] Function declarations not matching their parents --- actions/apiconversation.php | 11 ++--------- actions/conversation.php | 2 +- lib/clienterroraction.php | 4 ++-- lib/fullthreadednoticelist.php | 2 +- lib/servererroraction.php | 4 ++-- plugins/Mobile/WAP20Plugin.php | 2 +- plugins/QnA/QnAPlugin.php | 4 ++-- 7 files changed, 11 insertions(+), 18 deletions(-) diff --git a/actions/apiconversation.php b/actions/apiconversation.php index 0e292303d5..5e1102b2f6 100644 --- a/actions/apiconversation.php +++ b/actions/apiconversation.php @@ -49,16 +49,9 @@ class ApiconversationAction extends ApiAuthAction protected $conversation = null; protected $notices = null; - /** - * For initializing members of the class. - * - * @param array $argarray misc. arguments - * - * @return boolean true - */ - function prepare($argarray) + protected function prepare(array $args=array()) { - parent::prepare($argarray); + parent::prepare($args); $convId = $this->trimmed('id'); diff --git a/actions/conversation.php b/actions/conversation.php index 5a6e4b5c7a..b1cb50abac 100644 --- a/actions/conversation.php +++ b/actions/conversation.php @@ -97,7 +97,7 @@ class ConversationAction extends ManagedAction Event::handle('EndShowConversation', array($this, $this->conv, $this->scoped)); } - function isReadOnly() + function isReadOnly($args) { return true; } diff --git a/lib/clienterroraction.php b/lib/clienterroraction.php index 9233c9bde6..37f722291e 100644 --- a/lib/clienterroraction.php +++ b/lib/clienterroraction.php @@ -72,9 +72,9 @@ class ClientErrorAction extends ErrorAction // XXX: Should these error actions even be invokable via URI? - function handle($args) + protected function handle() { - parent::handle($args); + parent::handle(); $this->code = $this->trimmed('code'); diff --git a/lib/fullthreadednoticelist.php b/lib/fullthreadednoticelist.php index 52b5f279c9..0cc023ca5d 100644 --- a/lib/fullthreadednoticelist.php +++ b/lib/fullthreadednoticelist.php @@ -48,7 +48,7 @@ if (!defined('STATUSNET')) { class FullThreadedNoticeList extends ThreadedNoticeList { - function newListItem($notice) + function newListItem(Notice $notice) { return new FullThreadedNoticeListItem($notice, $this->out, $this->userProfile); } diff --git a/lib/servererroraction.php b/lib/servererroraction.php index 54cc99099a..c8e3067b82 100644 --- a/lib/servererroraction.php +++ b/lib/servererroraction.php @@ -78,9 +78,9 @@ class ServerErrorAction extends ErrorAction // XXX: Should these error actions even be invokable via URI? - function handle($args) + protected function handle() { - parent::handle($args); + parent::handle(); $this->code = $this->trimmed('code'); diff --git a/plugins/Mobile/WAP20Plugin.php b/plugins/Mobile/WAP20Plugin.php index fc5008cda6..a48a32e9f1 100644 --- a/plugins/Mobile/WAP20Plugin.php +++ b/plugins/Mobile/WAP20Plugin.php @@ -43,7 +43,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { class WAP20Plugin extends Plugin { - function onStartShowHTML($action) + function onStartShowHTML(Action $action) { } diff --git a/plugins/QnA/QnAPlugin.php b/plugins/QnA/QnAPlugin.php index f64cd905cf..e8c983eb9a 100644 --- a/plugins/QnA/QnAPlugin.php +++ b/plugins/QnA/QnAPlugin.php @@ -260,7 +260,7 @@ class QnAPlugin extends MicroAppPlugin * @return boolean hook value */ - function onStartOpenNoticeListItemElement($nli) + function onStartOpenNoticeListItemElement(NoticeListItem $nli) { $type = $nli->notice->object_type; @@ -325,7 +325,7 @@ class QnAPlugin extends MicroAppPlugin * * @todo FIXME: WARNING WARNING WARNING this closes a 'div' that is implicitly opened in BookmarkPlugin's showNotice implementation */ - function onStartShowNoticeItem($nli) + function onStartShowNoticeItem(NoticeListItem $nli) { if (!$this->isMyNotice($nli->notice)) { return true;