Merge "Don't hard-code Preferences page name"

[lhc/web/wiklou.git] / includes / Preferences.php

diff --git a/includes/Preferences.php b/includes/Preferences.php
index 15ed2d4..c64e8a8 100644 (file)
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -109,7 +109,7 @@ class Preferences {
         * @throws MWException
         * @param User $user
         * @param IContextSource $context
-        * @param array $defaultPreferences Array to load values for
+        * @param array &$defaultPreferences Array to load values for
         * @return array|null
         */
        static function loadPreferenceValues( $user, $context, &$defaultPreferences ) {
@@ -202,7 +202,7 @@ class Preferences {
        /**
         * @param User $user
         * @param IContextSource $context
-        * @param array $defaultPreferences
+        * @param array &$defaultPreferences
         * @return void
         */
        static function profilePreferences( $user, IContextSource $context, &$defaultPreferences ) {
@@ -599,7 +599,7 @@ class Preferences {
        /**
         * @param User $user
         * @param IContextSource $context
-        * @param array $defaultPreferences
+        * @param array &$defaultPreferences
         * @return void
         */
        static function skinPreferences( $user, IContextSource $context, &$defaultPreferences ) {
@@ -650,7 +650,7 @@ class Preferences {
        /**
         * @param User $user
         * @param IContextSource $context
-        * @param array $defaultPreferences
+        * @param array &$defaultPreferences
         */
        static function filesPreferences( $user, IContextSource $context, &$defaultPreferences ) {
                # # Files #####################################
@@ -671,7 +671,7 @@ class Preferences {
        /**
         * @param User $user
         * @param IContextSource $context
-        * @param array $defaultPreferences
+        * @param array &$defaultPreferences
         * @return void
         */
        static function datetimePreferences( $user, IContextSource $context, &$defaultPreferences ) {
@@ -749,7 +749,7 @@ class Preferences {
        /**
         * @param User $user
         * @param IContextSource $context
-        * @param array $defaultPreferences
+        * @param array &$defaultPreferences
         */
        static function renderingPreferences( $user, IContextSource $context, &$defaultPreferences ) {
                # # Diffs ####################################
@@ -811,7 +811,7 @@ class Preferences {
        /**
         * @param User $user
         * @param IContextSource $context
-        * @param array $defaultPreferences
+        * @param array &$defaultPreferences
         */
        static function editingPreferences( $user, IContextSource $context, &$defaultPreferences ) {
                # # Editing #####################################
@@ -832,10 +832,10 @@ class Preferences {
                                'section' => 'editing/editor',
                                'label-message' => 'editfont-style',
                                'options' => [
-                                       $context->msg( 'editfont-default' )->text() => 'default',
                                        $context->msg( 'editfont-monospace' )->text() => 'monospace',
                                        $context->msg( 'editfont-sansserif' )->text() => 'sans-serif',
                                        $context->msg( 'editfont-serif' )->text() => 'serif',
+                                       $context->msg( 'editfont-default' )->text() => 'default',
                                ]
                        ];
                }
@@ -884,7 +884,7 @@ class Preferences {
        /**
         * @param User $user
         * @param IContextSource $context
-        * @param array $defaultPreferences
+        * @param array &$defaultPreferences
         */
        static function rcPreferences( $user, IContextSource $context, &$defaultPreferences ) {
                $config = $context->getConfig();
@@ -920,6 +920,9 @@ class Preferences {
                $defaultPreferences['rcfilters-saved-queries'] = [
                        'type' => 'api',
                ];
+               $defaultPreferences['rcfilters-wl-saved-queries'] = [
+                       'type' => 'api',
+               ];
                $defaultPreferences['rcfilters-rclimit'] = [
                        'type' => 'api',
                ];
@@ -960,7 +963,7 @@ class Preferences {
        /**
         * @param User $user
         * @param IContextSource $context
-        * @param array $defaultPreferences
+        * @param array &$defaultPreferences
         */
        static function watchlistPreferences( $user, IContextSource $context, &$defaultPreferences ) {
                $config = $context->getConfig();
@@ -1044,6 +1047,11 @@ class Preferences {
                        'section' => 'watchlist/advancedwatchlist',
                        'label-message' => 'tog-watchlistreloadautomatically',
                ];
+               $defaultPreferences['watchlistunwatchlinks'] = [
+                       'type' => 'toggle',
+                       'section' => 'watchlist/advancedwatchlist',
+                       'label-message' => 'tog-watchlistunwatchlinks',
+               ];
 
                if ( $config->get( 'RCWatchCategoryMembership' ) ) {
                        $defaultPreferences['watchlisthidecategorization'] = [
@@ -1110,7 +1118,7 @@ class Preferences {
        /**
         * @param User $user
         * @param IContextSource $context
-        * @param array $defaultPreferences
+        * @param array &$defaultPreferences
         */
        static function searchPreferences( $user, IContextSource $context, &$defaultPreferences ) {
                foreach ( MWNamespace::getValidNamespaces() as $n ) {
@@ -1122,6 +1130,9 @@ class Preferences {
 
        /**
         * Dummy, kept for backwards-compatibility.
+        * @param User $user
+        * @param IContextSource $context
+        * @param array &$defaultPreferences
         */
        static function miscPreferences( $user, IContextSource $context, &$defaultPreferences ) {
        }
@@ -1674,7 +1685,7 @@ class PreferencesForm extends HTMLForm {
                $html = parent::getButtons();
 
                if ( $this->getModifiedUser()->isAllowed( 'editmyoptions' ) ) {
-                       $t = SpecialPage::getTitleFor( 'Preferences', 'reset' );
+                       $t = $this->getTitle()->getSubpage( 'reset' );
 
                        $linkRenderer = MediaWikiServices::getInstance()->getLinkRenderer();
                        $html .= "\n" . $linkRenderer->makeLink( $t, $this->msg( 'restoreprefs' )->text(),