From: Sam Reed <reedy@users.mediawiki.org>
Date: Sun, 31 Jan 2010 21:12:15 +0000 (+0000)
Subject: Whitespace/brace cleanup to ApiQueryDeletedrevs
X-Git-Tag: 1.31.0-rc.0~38013
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/operations/recherche.php?a=commitdiff_plain;h=71cd3c00360a9f28a238cda56f14f943e44327f8;p=lhc%2Fweb%2Fwiklou.git

Whitespace/brace cleanup to ApiQueryDeletedrevs
---

diff --git a/includes/api/ApiQueryDeletedrevs.php b/includes/api/ApiQueryDeletedrevs.php
index 11bfba2fdb..7b94c84cf6 100644
--- a/includes/api/ApiQueryDeletedrevs.php
+++ b/includes/api/ApiQueryDeletedrevs.php
@@ -73,7 +73,7 @@ class ApiQueryDeletedrevs extends ApiQueryBase {
 			$mode = 'user';
 		
 		if ( !is_null( $params['user'] ) && !is_null( $params['excludeuser'] ) )
-				$this->dieUsage( 'user and excludeuser cannot be used together', 'badparams' );
+			$this->dieUsage( 'user and excludeuser cannot be used together', 'badparams' );
 
 		$this->addTables( 'archive' );
 		$this->addWhere( 'ar_deleted = 0' );
@@ -88,8 +88,7 @@ class ApiQueryDeletedrevs extends ApiQueryBase {
 			$this->addFields( 'ar_minor_edit' );
 		if ( $fld_len )
 			$this->addFields( 'ar_len' );
-		if ( $fld_content )
-		{
+		if ( $fld_content ) {
 			$this->addTables( 'text' );
 			$this->addFields( array( 'ar_text', 'ar_text_id', 'old_text', 'old_flags' ) );
 			$this->addWhere( 'ar_text_id = old_id' );
@@ -116,14 +115,11 @@ class ApiQueryDeletedrevs extends ApiQueryBase {
 			$token = $wgUser->editToken();
 
 		// We need a custom WHERE clause that matches all titles.
-		if ( $mode == 'revs' )
-		{
+		if ( $mode == 'revs' ) {
 			$lb = new LinkBatch( $titles );
 			$where = $lb->constructSet( 'ar', $db );
 			$this->addWhere( $where );
-		}
-		elseif ( $mode == 'all' )
-		{
+		} elseif ( $mode == 'all' ) {
 			$this->addWhereFld( 'ar_namespace', $params['namespace'] );
 			if ( !is_null( $params['from'] ) )
 			{
@@ -157,18 +153,14 @@ class ApiQueryDeletedrevs extends ApiQueryBase {
 
 		$this->addOption( 'LIMIT', $limit + 1 );
 		$this->addOption( 'USE INDEX', array( 'archive' => ( $mode == 'user' ? 'usertext_timestamp' : 'name_title_timestamp' ) ) );
-		if ( $mode == 'all' )
-		{
+		if ( $mode == 'all' ) {
 			if ( $params['unique'] )
 			{
 				$this->addOption( 'GROUP BY', 'ar_title' );
 				$this->addOption( 'ORDER BY', 'ar_title' );
-			}
-			else
+			} else
 				$this->addOption( 'ORDER BY', 'ar_title, ar_timestamp' );
-		}
-		else
-		{
+		} else {
 			if ( $mode == 'revs' )
 			{
 				// Sort by ns and title in the same order as timestamp for efficiency
@@ -183,8 +175,7 @@ class ApiQueryDeletedrevs extends ApiQueryBase {
 		$newPageID = 0;
 		while ( $row = $db->fetchObject( $res ) )
 		{
-			if ( ++$count > $limit )
-			{
+			if ( ++$count > $limit ) {
 				// We've had enough
 				if ( $mode == 'all' || $mode == 'revs' )
 					$this->setContinueEnumParameter( 'continue', intval( $row->ar_namespace ) . '|' .
@@ -209,8 +200,7 @@ class ApiQueryDeletedrevs extends ApiQueryBase {
 			if ( $fld_content )
 				ApiResult::setContent( $rev, Revision::getRevisionText( $row ) );
 
-			if ( !isset( $pageMap[$row->ar_namespace][$row->ar_title] ) )
-			{
+			if ( !isset( $pageMap[$row->ar_namespace][$row->ar_title] ) ) {
 				$pageID = $newPageID++;
 				$pageMap[$row->ar_namespace][$row->ar_title] = $pageID;
 				$t = Title::makeTitle( $row->ar_namespace, $row->ar_title );
@@ -220,16 +210,13 @@ class ApiQueryDeletedrevs extends ApiQueryBase {
 				if ( $fld_token )
 					$a['token'] = $token;
 				$fit = $result->addValue( array( 'query', $this->getModuleName() ), $pageID, $a );
-			}
-			else
-			{
+			} else {
 				$pageID = $pageMap[$row->ar_namespace][$row->ar_title];
 				$fit = $result->addValue(
 					array( 'query', $this->getModuleName(), $pageID, 'revisions' ),
 					null, $rev );
 			}
-			if ( !$fit )
-			{
+			if ( !$fit ) {
 				if ( $mode == 'all' || $mode == 'revs' )
 					$this->setContinueEnumParameter( 'continue', intval( $row->ar_namespace ) . '|' .
 						$this->keyToTitle( $row->ar_title ) . '|' . $row->ar_timestamp );