From 50d2d9ecbfd9c4df15fca290db33da1f5b657ab5 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <siebrand@users.mediawiki.org>
Date: Sun, 25 Apr 2010 23:11:12 +0000
Subject: [PATCH] (bug 23313) Move watchlisthidepatrolled above token in
 watchlist preferences to enhance preference grouping.

---
 RELEASE-NOTES            |  4 +++-
 includes/Preferences.php | 16 ++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index a772b25225..cca242a375 100644
--- 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 b9383d873a..502af4ea0d 100644
--- 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',
-- 
2.20.1