Merge "Pass $context to 'GetPreferences' hook"

diff --git a/RELEASE-NOTES-1.33 b/RELEASE-NOTES-1.33
index 5ed9d5a..ae1468e 100644 (file)
--- a/RELEASE-NOTES-1.33
+++ b/RELEASE-NOTES-1.33
@@ -21,6 +21,7 @@ production.
 * …
 
 === New features in 1.33 ===
+* The 'GetPreferences' hook now receives an additional $context parameter.
 * …
 
 === External library changes in 1.33 ===

diff --git a/docs/hooks.txt b/docs/hooks.txt
index 14656fa..bd06d52 100644 (file)
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -1735,6 +1735,7 @@ $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 3ec6876..c552506 100644 (file)
--- 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 ] );
+               Hooks::run( 'GetPreferences', [ $user, &$preferences, $context ] );
 
                $this->loadPreferenceValues( $user, $context, $preferences );
                $this->logger->debug( "Created form descriptor for user '{$user->getName()}'" );