Merge branch 'archwiki'

# Conflicts:
#	skins/ArchLinux.php
#	skins/ArchLinux/archlogo.gif

1 files changed, 10 insertions, 10 deletions

diff --git a/maintenance/fetchText.php b/maintenance/fetchText.php
index 05470d30..fc676b89 100644
--- a/maintenance/fetchText.php
+++ b/maintenance/fetchText.php
@@ -37,11 +37,11 @@ class FetchText extends Maintenance {
 
 	/**
 	 * returns a string containing the following in order:
-	 *	 textid
-	 *	 \n
-	 *	 length of text (-1 on error = failure to retrieve/unserialize/gunzip/etc)
-	 *	 \n
-	 *	 text  (may be empty)
+	 *   textid
+	 *   \n
+	 *   length of text (-1 on error = failure to retrieve/unserialize/gunzip/etc)
+	 *   \n
+	 *   text  (may be empty)
 	 *
 	 * note that that the text string itself is *not* followed by newline
 	 */
@@ -59,8 +59,7 @@ class FetchText extends Maintenance {
 			if ( $text === false ) {
 				# actual error, not zero-length text
 				$textLen = "-1";
-			}
-			else {
+			} else {
 				$textLen = strlen( $text );
 			}
 			$this->output( $textId . "\n" . $textLen . "\n" . $text );
@@ -69,9 +68,9 @@ class FetchText extends Maintenance {
 
 	/**
 	 * May throw a database error if, say, the server dies during query.
-	 * @param $db DatabaseBase object
-	 * @param $id int The old_id
-	 * @return String
+	 * @param DatabaseBase $db
+	 * @param int $id The old_id
+	 * @return string
 	 */
 	private function doGetText( $db, $id ) {
 		$id = intval( $id );
@@ -83,6 +82,7 @@ class FetchText extends Maintenance {
 		if ( $text === false ) {
 			return false;
 		}
+
 		return $text;
 	}
 }