(bug 23313) Move watchlisthidepatrolled above token in watchlist preferences to enhan...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index a772b25..cca242a 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -123,8 +123,10 @@ in a negative namespace (which is invalid).
 * (bug 23080) New usernames now limited to 235 bytes so that custom skin files
   work.
 * (bug 23075) Correct MediaTransformError default width in gallery.
-* (bug 16487) The Anonymous user account used on Postgres is no longer 
+* (bug 16487) The Anonymous user account used on Postgres is no longer
   displayed on Special:Listusers.
+* (bug 23313) Move watchlisthidepatrolled above token in watchlist preferences
+  to enhance preference grouping.
 
 === API changes in 1.17 ===
 * (bug 22738) Allow filtering by action type on query=logevent

diff --git a/includes/Preferences.php b/includes/Preferences.php
index b9383d8..502af4e 100644 (file)
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -844,6 +844,14 @@ class Preferences {
                        'label-message' => 'tog-watchlisthideliu',
                );
 
+               if ( $wgUseRCPatrol ) {
+                       $defaultPreferences['watchlisthidepatrolled'] = array(
+                               'type' => 'toggle',
+                               'section' => 'watchlist/advancedwatchlist',
+                               'label-message' => 'tog-watchlisthidepatrolled',
+                       );
+               }
+
                if ( $wgEnableAPI ) {
                        # Some random gibberish as a proposed default
                        $hash = sha1( mt_rand() . microtime( true ) );
@@ -856,14 +864,6 @@ class Preferences {
                        );
                }
 
-               if ( $wgUseRCPatrol ) {
-                       $defaultPreferences['watchlisthidepatrolled'] = array(
-                               'type' => 'toggle',
-                               'section' => 'watchlist/advancedwatchlist',
-                               'label-message' => 'tog-watchlisthidepatrolled',
-                       );
-               }
-
                $watchTypes = array(
                        'edit' => 'watchdefault',
                        'move' => 'watchmoves',