From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Thu, 14 Mar 2019 17:39:18 +0000 (+0000)
Subject: Merge "SpecialWatchlist: Conditionally hide the namespace checkboxes"
X-Git-Tag: 1.34.0-rc.0~2530
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmembres/cotisations/gestion/rappel_supprimer.php?a=commitdiff_plain;h=9101bf588bc2a2537f91a62fca84cf52ab186f5d;hp=-c;p=lhc%2Fweb%2Fwiklou.git

Merge "SpecialWatchlist: Conditionally hide the namespace checkboxes"
---

9101bf588bc2a2537f91a62fca84cf52ab186f5d
diff --combined includes/specials/SpecialWatchlist.php
index d59b66b9ef,3b595e48dc..4d2fc62dde
--- a/includes/specials/SpecialWatchlist.php
+++ b/includes/specials/SpecialWatchlist.php
@@@ -63,6 -63,7 +63,7 @@@ class SpecialWatchlist extends ChangesL
  		$this->addHelpLink( 'Help:Watching pages' );
  		$output->addModuleStyles( [ 'mediawiki.special' ] );
  		$output->addModules( [
+ 			'mediawiki.special.recentchanges',
  			'mediawiki.special.watchlist',
  		] );
  
@@@ -343,7 -344,7 +344,7 @@@
  		$join_conds = array_merge(
  			[
  				'watchlist' => [
 -					'INNER JOIN',
 +					'JOIN',
  					[
  						'wl_user' => $user->getId(),
  						'wl_namespace=rc_namespace',
@@@ -655,14 -656,15 +656,15 @@@
  				'class' => 'namespaceselector',
  			]
  		) . "\n";
- 		$namespaceForm .= '<span class="mw-input-with-label">' . Xml::checkLabel(
+ 		$hidden = $opts['namespace'] === '' ? ' mw-input-hidden' : '';
+ 		$namespaceForm .= '<span class="mw-input-with-label' . $hidden . '">' . Xml::checkLabel(
  			$this->msg( 'invert' )->text(),
  			'invert',
  			'nsinvert',
  			$opts['invert'],
  			[ 'title' => $this->msg( 'tooltip-invert' )->text() ]
  		) . "</span>\n";
- 		$namespaceForm .= '<span class="mw-input-with-label">' . Xml::checkLabel(
+ 		$namespaceForm .= '<span class="mw-input-with-label' . $hidden . '">' . Xml::checkLabel(
  			$this->msg( 'namespace_association' )->text(),
  			'associated',
  			'nsassociated',