Merge "ParserOptions: added comment regarding editsections usage."

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

diff --git a/includes/Preferences.php b/includes/Preferences.php
index fbb7b51..248b308 100644 (file)
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -751,7 +751,11 @@ class Preferences {
                        'type' => 'select',
                        'section' => 'rendering/advancedrendering',
                        'options' => $stubThresholdOptions,
-                       'label-raw' => $context->msg( 'stub-threshold' )->text(), // Raw HTML message. Yay?
+                       // This is not a raw HTML message; label-raw is needed for the manual <a></a>
+                       'label-raw' => $context->msg( 'stub-threshold' )->rawParams(
+                               '<a href="#" class="stub">' .
+                               $context->msg( 'stub-threshold-sample-link' )->parse() .
+                               '</a>' )->parse(),
                );
 
                $defaultPreferences['showhiddencats'] = array(
@@ -888,12 +892,6 @@ class Preferences {
                        'section' => 'rc/advancedrc',
                );
 
-               $defaultPreferences['hidecategorization'] = array(
-                       'type' => 'toggle',
-                       'label-message' => 'tog-hidecategorization',
-                       'section' => 'rc/advancedrc',
-               );
-
                if ( $user->useRCPatrol() ) {
                        $defaultPreferences['hidepatrolled'] = array(
                                'type' => 'toggle',
@@ -1001,12 +999,6 @@ class Preferences {
                        'label-message' => 'tog-watchlisthideliu',
                );
 
-               $defaultPreferences['watchlisthidecategorization'] = array(
-                       'type' => 'toggle',
-                       'section' => 'watchlist/advancedwatchlist',
-                       'label-message' => 'tog-watchlisthidecategorization',
-               );
-
                if ( $user->useRCPatrol() ) {
                        $defaultPreferences['watchlisthidepatrolled'] = array(
                                'type' => 'toggle',