From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Thu, 6 Oct 2011 13:44:37 +0000 (+0000)
Subject: Revert r88025 (put Special:Contributions namespace filter behind $wgMiserMode). Peopl... 
X-Git-Tag: 1.31.0-rc.0~27231
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=1d8b7ba30df0cade7768185dd152f9b910209960;p=lhc%2Fweb%2Fwiklou.git

Revert r88025 (put Special:Contributions namespace filter behind $wgMiserMode). People on-wiki really hate this, and Domas gave the green light (see https://bugzilla.wikimedia.org/show_bug.cgi?id=31197#c34 )
---

diff --git a/includes/specials/SpecialContributions.php b/includes/specials/SpecialContributions.php
index 3de70fae2d..0593399b27 100644
--- a/includes/specials/SpecialContributions.php
+++ b/includes/specials/SpecialContributions.php
@@ -337,7 +337,7 @@ class SpecialContributions extends SpecialPage {
 	 * @return String: HTML fragment
 	 */
 	protected function getForm() {
-		global $wgScript, $wgMiserMode;
+		global $wgScript;
 
 		$this->opts['title'] = $this->getTitle()->getPrefixedText();
 		if( !isset( $this->opts['target'] ) ) {
@@ -387,12 +387,6 @@ class SpecialContributions extends SpecialPage {
 
 		$tagFilter = ChangeTags::buildTagFilterSelector( $this->opts['tagFilter'] );
 
-		$fNS = ( $wgMiserMode ) ? '' :
-			Html::rawElement( 'span', array( 'style' => 'white-space: nowrap' ),
-				Xml::label( wfMsg( 'namespace' ), 'namespace' ) . ' ' .
-				Xml::namespaceSelector( $this->opts['namespace'], '' )
-			);
-
 		$f .= 	Xml::fieldset( wfMsg( 'sp-contributions-search' ) ) .
 			Xml::radioLabel( wfMsgExt( 'sp-contributions-newbies', array( 'parsemag' ) ),
 				'contribs', 'newbie' , 'newbie', $this->opts['contribs'] == 'newbie' ) . '<br />' .
@@ -402,7 +396,10 @@ class SpecialContributions extends SpecialPage {
 				'size' => '20',
 				'required' => ''
 			) + ( $this->opts['target'] ? array() : array( 'autofocus' ) ) ) . ' '.
-			$fNS.
+			Html::rawElement( 'span', array( 'style' => 'white-space: nowrap' ),
+				Xml::label( wfMsg( 'namespace' ), 'namespace' ) . ' ' .
+				Xml::namespaceSelector( $this->opts['namespace'], '' )
+			) .
 			Xml::checkLabel( wfMsg( 'history-show-deleted' ),
 				'deletedOnly', 'mw-show-deleted-only', $this->opts['deletedOnly'] ) . '<br />' .
 			Xml::tags( 'p', null, Xml::checkLabel( wfMsg( 'sp-contributions-toponly' ),