Don't percent-encode HTML5 IDs

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

diff --git a/includes/Preferences.php b/includes/Preferences.php
index 25f0dbd..c29c4b9 100644 (file)
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -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',
                                ]
                        ];
                }
@@ -958,6 +958,15 @@ class Preferences {
                                'label-message' => 'tog-shownumberswatching',
                        ];
                }
+
+               if ( $config->get( 'StructuredChangeFiltersShowPreference' ) ) {
+                       $defaultPreferences['rcenhancedfilters-disable'] = [
+                               'type' => 'toggle',
+                               'section' => 'rc/advancedrc',
+                               'label-message' => 'rcfilters-preference-label',
+                               'help-message' => 'rcfilters-preference-help',
+                       ];
+               }
        }
 
        /**
@@ -1685,7 +1694,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(),