Merge "Don't hard-code Preferences page name"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 21 Aug 2017 22:41:17 +0000 (22:41 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 21 Aug 2017 22:41:17 +0000 (22:41 +0000)
1  2 
includes/Preferences.php

diff --combined includes/Preferences.php
@@@ -832,10 -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',
                                ]
                        ];
                }
                $defaultPreferences['rcfilters-saved-queries'] = [
                        'type' => 'api',
                ];
 +              $defaultPreferences['rcfilters-wl-saved-queries'] = [
 +                      'type' => 'api',
 +              ];
                $defaultPreferences['rcfilters-rclimit'] = [
                        'type' => 'api',
                ];
@@@ -1685,7 -1682,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(),