From 4b275c60dea5402a2d23f7f8dafe733511edffdf Mon Sep 17 00:00:00 2001 From: Krinkle Date: Sun, 9 Dec 2018 02:12:24 +0000 Subject: [PATCH] Revert "Pass $context to 'GetPreferences' hook" This reverts commit d68569459420e80aa0e2f2636fc7160c643cf5fb. Change-Id: I1e9299b8fdc4727895fdac60f04cc5dfa4d09b7a --- RELEASE-NOTES-1.33 | 1 - docs/hooks.txt | 1 - includes/preferences/DefaultPreferencesFactory.php | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/RELEASE-NOTES-1.33 b/RELEASE-NOTES-1.33 index 8d4ac33dc7..baf3689c12 100644 --- a/RELEASE-NOTES-1.33 +++ b/RELEASE-NOTES-1.33 @@ -34,7 +34,6 @@ production. * … === New features in 1.33 === -* The 'GetPreferences' hook now receives an additional $context parameter. * (T96041) __EXPECTUNUSEDCATEGORY__ on a category page causes the category to be hidden on Special:UnusedCategories. * Add PasswordPolicy to check the password isn't in the large blacklist. diff --git a/docs/hooks.txt b/docs/hooks.txt index 2f800a418c..a7ff45385d 100644 --- a/docs/hooks.txt +++ b/docs/hooks.txt @@ -1735,7 +1735,6 @@ $out: OutputPage object (to check what type of page the user is on) 'GetPreferences': Modify user preferences. $user: User whose preferences are being modified. &$preferences: Preferences description array, to be fed to an HTMLForm object -$context: IContextSource object (added in 1.33) 'GetRelativeTimestamp': Pre-emptively override the relative timestamp generated by MWTimestamp::getRelativeTimestamp(). Return false in this hook to use the diff --git a/includes/preferences/DefaultPreferencesFactory.php b/includes/preferences/DefaultPreferencesFactory.php index 769954d9b9..512a6b3829 100644 --- a/includes/preferences/DefaultPreferencesFactory.php +++ b/includes/preferences/DefaultPreferencesFactory.php @@ -127,7 +127,7 @@ class DefaultPreferencesFactory implements PreferencesFactory { $this->watchlistPreferences( $user, $context, $preferences ); $this->searchPreferences( $preferences ); - Hooks::run( 'GetPreferences', [ $user, &$preferences, $context ] ); + Hooks::run( 'GetPreferences', [ $user, &$preferences ] ); $this->loadPreferenceValues( $user, $context, $preferences ); $this->logger->debug( "Created form descriptor for user '{$user->getName()}'" ); -- 2.20.1