r24680 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r24679‎ | r24680 | r24681 >
Date:17:46, 8 August 2007
Author:robchurch
Status:old
Tags:
Comment:
Revert r24574 and r24667 per Brion on bug 10798
Modified paths:
  • /trunk/phase3/RELEASE-NOTES (modified) (history)
  • /trunk/phase3/includes/SpecialProtectedpages.php (modified) (history)
  • /trunk/phase3/includes/Xml.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/Xml.php
@@ -96,10 +96,9 @@
9797 * @param mixed $selected Namespace which should be pre-selected
9898 * @param mixed $all Value of an item denoting all namespaces, or null to omit
9999 * @param bool $hidden Include hidden namespaces? [WTF? --RC]
100 - * @param array $exclude Array of indexes to exclude
101100 * @return string
102101 */
103 - public static function namespaceSelector( $selected = '', $all = null, $hidden = false, $exclude = array() ) {
 102+ public static function namespaceSelector( $selected = '', $all = null, $hidden = false ) {
104103 global $wgContLang;
105104 $namespaces = $wgContLang->getFormattedNamespaces();
106105 $options = array();
@@ -107,7 +106,7 @@
108107 if( !is_null( $all ) )
109108 $namespaces = array( $all => wfMsg( 'namespacesall' ) ) + $namespaces;
110109 foreach( $namespaces as $index => $name ) {
111 - if( $index < NS_MAIN || in_array( $index, $exclude ) )
 110+ if( $index < NS_MAIN )
112111 continue;
113112 if( $index === 0 )
114113 $name = wfMsg( 'blanknamespace' );
Index: trunk/phase3/includes/SpecialProtectedpages.php
@@ -129,7 +129,7 @@
130130 function getNamespaceMenu( $namespace = null ) {
131131 return Xml::label( wfMsg( 'namespace' ), 'namespace' )
132132 . '&nbsp;'
133 - . Xml::namespaceSelector( $namespace, '', false, array( NS_MEDIAWIKI ) );
 133+ . Xml::namespaceSelector( $namespace, '' );
134134 }
135135
136136 /**
Index: trunk/phase3/RELEASE-NOTES
@@ -162,8 +162,6 @@
163163 * Improved file history presentation
164164 * (bug 10739) Users can now enter comments when reverting files
165165 * Improved handling of permissions errors
166 -* (bug 10798) Exclude MediaWiki namespace from filtering options on
167 - Special:Protectedpages (implicit protection, doesn't make sense to have it)
168166 * (bug 10793) "Mark patrolled" links will now be shown for users with
169167 patrol permissions on all eligible diff pages
170168 * (bug 10655) Show standard tool links for blocked users in block log messages

Follow-up revisions

RevisionCommit summaryAuthorDate
r24705Merged revisions 24632-24693 via svnmerge from...david19:15, 9 August 2007

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r24574* (bug 10798) Exclude MediaWiki namespace from filtering options on Special:P...robchurch12:20, 4 August 2007
r24631Merged revisions 24480-24600 via svnmerge from...david18:39, 6 August 2007
r24667Don't exclude NS_MEDIAWIKI_TALKrobchurch00:59, 8 August 2007

Status & tagging log