Merge branch 'archwiki'

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

1 files changed, 8 insertions, 5 deletions

diff --git a/includes/api/ApiFormatJson.php b/includes/api/ApiFormatJson.php
index 47d82124..d9f9d46a 100644
--- a/includes/api/ApiFormatJson.php
+++ b/includes/api/ApiFormatJson.php
@@ -32,7 +32,7 @@ class ApiFormatJson extends ApiFormatBase {
 
 	private $mIsRaw;
 
-	public function __construct( $main, $format ) {
+	public function __construct( ApiMain $main, $format ) {
 		parent::__construct( $main, $format );
 		$this->mIsRaw = ( $format === 'rawfm' );
 	}
@@ -43,6 +43,7 @@ class ApiFormatJson extends ApiFormatBase {
 		if ( $params['callback'] ) {
 			return 'text/javascript';
 		}
+
 		return 'application/json';
 	}
 
@@ -92,16 +93,18 @@ class ApiFormatJson extends ApiFormatBase {
 
 	public function getParamDescription() {
 		return array(
-			'callback' => 'If specified, wraps the output into a given function call. For safety, all user-specific data will be restricted.',
-			'utf8' => 'If specified, encodes most (but not all) non-ASCII characters as UTF-8 instead of replacing them with hexadecimal escape sequences.',
+			'callback' => 'If specified, wraps the output into a given function ' .
+				'call. For safety, all user-specific data will be restricted.',
+			'utf8' => 'If specified, encodes most (but not all) non-ASCII ' .
+				'characters as UTF-8 instead of replacing them with hexadecimal escape sequences.',
 		);
 	}
 
 	public function getDescription() {
 		if ( $this->mIsRaw ) {
 			return 'Output data with the debugging elements in JSON format' . parent::getDescription();
-		} else {
-			return 'Output data in JSON format' . parent::getDescription();
 		}
+
+		return 'Output data in JSON format' . parent::getDescription();
 	}
 }