From: Bartosz Dziewoński <matma.rex@gmail.com>
Date: Sat, 9 Nov 2013 00:37:59 +0000 (+0100)
Subject: SpecialWatchlist: Minor cleanup
X-Git-Tag: 1.31.0-rc.0~18215^2
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_aide%28?a=commitdiff_plain;h=77af65b9c5b6ac52d6c242c0304480417bfeec8c;p=lhc%2Fweb%2Fwiklou.git

SpecialWatchlist: Minor cleanup

* Prettier whitespacing
* Removed query building special-case already handled by makeList()

Change-Id: I45aa7bbbff1e21abd739825939fd5cd3d02fc7a4
---

diff --git a/includes/specials/SpecialWatchlist.php b/includes/specials/SpecialWatchlist.php
index 336b05bdd1..62c33a2fec 100644
--- a/includes/specials/SpecialWatchlist.php
+++ b/includes/specials/SpecialWatchlist.php
@@ -60,15 +60,21 @@ class SpecialWatchlist extends SpecialPage {
 		// Add feed links
 		$wlToken = $user->getTokenFromOption( 'watchlisttoken' );
 		if ( $wlToken ) {
-			$this->addFeedLinks( array( 'action' => 'feedwatchlist', 'allrev' => 'allrev',
-								'wlowner' => $user->getName(), 'wltoken' => $wlToken ) );
+			$this->addFeedLinks( array(
+				'action' => 'feedwatchlist',
+				'allrev' => 1,
+				'wlowner' => $user->getName(),
+				'wltoken' => $wlToken,
+			) );
 		}
 
 		$this->setHeaders();
 		$this->outputHeader();
 
-		$output->addSubtitle( $this->msg( 'watchlistfor2', $user->getName()
-			)->rawParams( SpecialEditWatchlist::buildTools( null ) ) );
+		$output->addSubtitle(
+			$this->msg( 'watchlistfor2', $user->getName() )
+				->rawParams( SpecialEditWatchlist::buildTools( null ) )
+		);
 
 		$request = $this->getRequest();
 
@@ -205,10 +211,6 @@ class SpecialWatchlist extends SpecialPage {
 			$nonRevisionTypes = array( RC_LOG );
 			wfRunHooks( 'SpecialWatchlistGetNonRevisionTypes', array( &$nonRevisionTypes ) );
 			if ( $nonRevisionTypes ) {
-				if ( count( $nonRevisionTypes ) === 1 ) {
-					// if only one use an equality instead of IN condition
-					$nonRevisionTypes = reset( $nonRevisionTypes );
-				}
 				$conds[] = $dbr->makeList(
 					array(
 						'rc_this_oldid=page_latest',