X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FPreferences.php;h=de6d6813d7224e504861cbb8789a5b59188998e3;hb=e0c8007f49640f821e0407f18543e345e0cf76ab;hp=40176197b590b31caf32f31d12e3298d093ccf43;hpb=2ffff73a46c29cdad1cbf59063f4dd75debd3b4c;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/Preferences.php b/includes/Preferences.php
index 40176197b5..de6d6813d7 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -918,6 +918,9 @@ class Preferences {
 		$defaultPreferences['rcfilters-saved-queries'] = [
 			'type' => 'api',
 		];
+		$defaultPreferences['rcfilters-rclimit'] = [
+			'type' => 'api',
+		];
 
 		if ( $config->get( 'RCWatchCategoryMembership' ) ) {
 			$defaultPreferences['hidecategorization'] = [
@@ -1316,7 +1319,7 @@ class Preferences {
 		$formClass = 'PreferencesForm',
 		array $remove = []
 	) {
-		$formDescriptor = Preferences::getPreferences( $user, $context );
+		$formDescriptor = self::getPreferences( $user, $context );
 		if ( count( $remove ) ) {
 			$removeKeys = array_flip( $remove );
 			$formDescriptor = array_diff_key( $formDescriptor, $removeKeys );
@@ -1485,6 +1488,8 @@ class Preferences {
 		}
 
 		if ( $user->isAllowed( 'editmyoptions' ) ) {
+			$oldUserOptions = $user->getOptions();
+
 			foreach ( self::$saveBlacklist as $b ) {
 				unset( $formData[$b] );
 			}
@@ -1505,7 +1510,10 @@ class Preferences {
 				$user->setOption( $key, $value );
 			}
 
-			Hooks::run( 'PreferencesFormPreSave', [ $formData, $form, $user, &$result ] );
+			Hooks::run(
+				'PreferencesFormPreSave',
+				[ $formData, $form, $user, &$result, $oldUserOptions ]
+			);
 		}
 
 		MediaWiki\Auth\AuthManager::callLegacyAuthPlugin( 'updateExternalDB', [ $user ] );