From 82b0e618bd0c5cc4109fd0f1bcb691f1b4da9f49 Mon Sep 17 00:00:00 2001
From: Rob Church <robchurch@users.mediawiki.org>
Date: Wed, 8 Aug 2007 17:46:43 +0000
Subject: [PATCH] Revert r24574 and r24667 per Brion on bug 10798

---
 RELEASE-NOTES                      | 2 --
 includes/SpecialProtectedpages.php | 2 +-
 includes/Xml.php                   | 5 ++---
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 1efcfc2167..3bf9aed608 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -162,8 +162,6 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Improved file history presentation
 * (bug 10739) Users can now enter comments when reverting files
 * Improved handling of permissions errors
-* (bug 10798) Exclude MediaWiki namespace from filtering options on
-  Special:Protectedpages (implicit protection, doesn't make sense to have it)
 * (bug 10793) "Mark patrolled" links will now be shown for users with
   patrol permissions on all eligible diff pages
 * (bug 10655) Show standard tool links for blocked users in block log messages
diff --git a/includes/SpecialProtectedpages.php b/includes/SpecialProtectedpages.php
index cd85b1b2c9..416e861dd9 100644
--- a/includes/SpecialProtectedpages.php
+++ b/includes/SpecialProtectedpages.php
@@ -129,7 +129,7 @@ class ProtectedPagesForm {
 	function getNamespaceMenu( $namespace = null ) {
 		return Xml::label( wfMsg( 'namespace' ), 'namespace' )
 			. '&nbsp;'
-			. Xml::namespaceSelector( $namespace, '', false, array( NS_MEDIAWIKI ) );
+			. Xml::namespaceSelector( $namespace, '' );
 	}
 	
 	/**
diff --git a/includes/Xml.php b/includes/Xml.php
index a35d21bb45..eaedb79e70 100644
--- a/includes/Xml.php
+++ b/includes/Xml.php
@@ -96,10 +96,9 @@ class Xml {
 	 * @param mixed $selected Namespace which should be pre-selected
 	 * @param mixed $all Value of an item denoting all namespaces, or null to omit
 	 * @param bool $hidden Include hidden namespaces? [WTF? --RC]
-	 * @param array $exclude Array of indexes to exclude
 	 * @return string
 	 */
-	public static function namespaceSelector( $selected = '', $all = null, $hidden = false, $exclude = array() ) {
+	public static function namespaceSelector( $selected = '', $all = null, $hidden = false ) {
 		global $wgContLang;
 		$namespaces = $wgContLang->getFormattedNamespaces();
 		$options = array();
@@ -107,7 +106,7 @@ class Xml {
 		if( !is_null( $all ) )
 			$namespaces = array( $all => wfMsg( 'namespacesall' ) ) + $namespaces;
 		foreach( $namespaces as $index => $name ) {
-			if( $index < NS_MAIN || in_array( $index, $exclude ) )
+			if( $index < NS_MAIN )
 				continue;
 			if( $index === 0 )
 				$name = wfMsg( 'blanknamespace' );
-- 
2.20.1