From 6e336d3799182394abd370fa5b07628cb618efba Mon Sep 17 00:00:00 2001
From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Mon, 5 Sep 2011 11:22:57 +0000
Subject: [PATCH] Whitespace fixes for r95272, r95604

---
 includes/Export.php | 69 ++++++++++++++++++++-------------------------
 1 file changed, 31 insertions(+), 38 deletions(-)

diff --git a/includes/Export.php b/includes/Export.php
index c64f0b4294..4bf871428c 100644
--- a/includes/Export.php
+++ b/includes/Export.php
@@ -743,11 +743,10 @@ class DumpFileOutput extends DumpOutput {
 	}
 
 	function closeRenameAndReopen( $newname ) {
-		if ( is_array($newname) ) {
-			if (count($newname) > 1) {
-				throw new MWException(__METHOD__ . ": passed multiple arguments for rename of single file\n");
-			}
-			else {
+		if ( is_array( $newname ) ) {
+			if ( count( $newname ) > 1 ) {
+				throw new MWException( __METHOD__ . ": passed multiple arguments for rename of single file\n" );
+			} else {
 				$newname = $newname[0];
 			}
 		}
@@ -759,11 +758,10 @@ class DumpFileOutput extends DumpOutput {
 	}
 
 	function closeAndRename( $newname ) {
-		if ( is_array($newname) ) {
-			if (count($newname) > 1) {
-				throw new MWException(__METHOD__ . ": passed multiple arguments for rename of single file\n");
-			}
-			else {
+		if ( is_array( $newname ) ) {
+			if ( count( $newname ) > 1 ) {
+				throw new MWException( __METHOD__ . ": passed multiple arguments for rename of single file\n" );
+			} else {
 				$newname = $newname[0];
 			}
 		}
@@ -775,10 +773,9 @@ class DumpFileOutput extends DumpOutput {
 
 	function rename( $newname ) {
 		if ( is_array($newname) ) {
-			if (count($newname) > 1) {
-				throw new MWException(__METHOD__ . ": passed multiple arguments for rename of single file\n");
-			}
-			else {
+			if ( count( $newname ) > 1 ) {
+				throw new MWException( __METHOD__ . ": passed multiple arguments for rename of single file\n" );
+			} else {
 				$newname = $newname[0];
 			}
 		}
@@ -806,7 +803,7 @@ class DumpPipeOutput extends DumpFileOutput {
 			$command .=  " > " . wfEscapeShellArg( $file );
 		}
 		
-		$this->startCommand($command);
+		$this->startCommand( $command );
 		$this->command = $command;
 		$this->filename = $file;
 	}
@@ -825,11 +822,10 @@ class DumpPipeOutput extends DumpFileOutput {
 	 * and reopen new file with the old name. 
 	 */
 	function closeRenameAndReopen( $newname ) {
-		if ( is_array($newname) ) {
-			if (count($newname) > 1) {
-				throw new MWException(__METHOD__ . ": passed multiple arguments for rename of single file\n");
-			}
-			else {
+		if ( is_array( $newname ) ) {
+			if ( count( $newname ) > 1) {
+				throw new MWException( __METHOD__ . ": passed multiple arguments for rename of single file\n" );
+			} else {
 				$newname = $newname[0];
 			}
 		}
@@ -844,11 +840,10 @@ class DumpPipeOutput extends DumpFileOutput {
 	}
 
 	function closeAndRename( $newname ) {
-		if ( is_array($newname) ) {
-			if (count($newname) > 1) {
-				throw new MWException(__METHOD__ . ": passed multiple arguments for rename of single file\n");
-			}
-			else {
+		if ( is_array( $newname ) ) {
+			if ( count( $newname ) > 1 ) {
+				throw new MWException( __METHOD__ . ": passed multiple arguments for rename of single file\n" );
+			} else {
 				$newname = $newname[0];
 			}
 		}
@@ -861,11 +856,10 @@ class DumpPipeOutput extends DumpFileOutput {
 	}
 
 	function rename( $newname ) {
-		if ( is_array($newname) ) {
-			if (count($newname) > 1) {
-				throw new MWException(__METHOD__ . ": passed multiple arguments for rename of single file\n");
-			}
-			else {
+		if ( is_array( $newname ) ) {
+			if ( count( $newname ) > 1) {
+				throw new MWException( __METHOD__ . ": passed multiple arguments for rename of single file\n" );
+			} else {
 				$newname = $newname[0];
 			}
 		}
@@ -922,26 +916,25 @@ class Dump7ZipOutput extends DumpPipeOutput {
 		}
 		if ( $newname ) {
 			fclose( $this->handle );
-			proc_close($this->procOpenResource);
+			proc_close( $this->procOpenResource );
 			rename( $this->filename, $newname );
 			$command = "7za a -bd -si " . wfEscapeShellArg( $file );
 			$command .= ' >' . wfGetNull() . ' 2>&1';
-			$this->startCommand($command);
+			$this->startCommand( $command );
 		}
 	}
 
 	function closeAndRename( $newname ) {
-		if ( is_array($newname) ) {
-			if (count($newname) > 1) {
-				throw new MWException(__METHOD__ . ": passed multiple arguments for rename of single file\n");
-			}
-			else {
+		if ( is_array( $newname ) ) {
+			if ( count( $newname ) > 1 ) {
+				throw new MWException( __METHOD__ . ": passed multiple arguments for rename of single file\n" );
+			} else {
 				$newname = $newname[0];
 			}
 		}
 		if ( $newname ) {
 			fclose( $this->handle );
-			proc_close($this->procOpenResource);
+			proc_close( $this->procOpenResource );
 			rename( $this->filename, $newname );
 		}
 	}
-- 
2.20.1