From: Sam Reed <reedy@users.mediawiki.org>
Date: Sun, 5 Jun 2011 23:44:37 +0000 (+0000)
Subject: Fixup error message
X-Git-Tag: 1.31.0-rc.0~29682
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=202f4d744341c921a490f512ebf7dfc33a36111d;p=lhc%2Fweb%2Fwiklou.git

Fixup error message

Remove {} (documentation tweaks)

Remove whitespace
---

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 6ce6271591..11ae64647a 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -2174,8 +2174,6 @@ function wfTimestamp( $outputtype = TS_UNIX, $ts = 0 ) {
 		return false;
 	}
 
-
-
 	static $formats = array(
 		TS_UNIX => 'U',
 		TS_MW => 'YmdHis',
diff --git a/includes/api/ApiQueryAllimages.php b/includes/api/ApiQueryAllimages.php
index 020b4b932b..fbfdeca4a6 100644
--- a/includes/api/ApiQueryAllimages.php
+++ b/includes/api/ApiQueryAllimages.php
@@ -126,7 +126,7 @@ class ApiQueryAllimages extends ApiQueryGeneratorBase {
 		if ( !is_null( $params['mime'] ) ) {
 			global $wgMiserMode;
 			if ( $wgMiserMode  ) {
-				$this->dieUsage( 'MIME search disabled in Miser Mode', 'mimeearchdisabled' );
+				$this->dieUsage( 'MIME search disabled in Miser Mode', 'mimesearchdisabled' );
 			}
 
 			list( $major, $minor ) = File::splitMime( $params['mime'] );
@@ -259,7 +259,7 @@ class ApiQueryAllimages extends ApiQueryGeneratorBase {
 		return array_merge( parent::getPossibleErrors(), array(
 			array( 'code' => 'params', 'info' => 'Use "gaifilterredir=nonredirects" option instead of "redirects" when using allimages as a generator' ),
 			array( 'code' => 'unsupportedrepo', 'info' => 'Local file repository does not support querying all images' ),
-			array( 'code' => 'mimeearchdisabled', 'info' => 'MIME search disabled in Miser Mode' ),
+			array( 'code' => 'mimesearchdisabled', 'info' => 'MIME search disabled in Miser Mode' ),
 			array( 'code' => 'invalidsha1hash', 'info' => 'The SHA1 hash provided is not valid' ),
 			array( 'code' => 'invalidsha1base36hash', 'info' => 'The SHA1Base36 hash provided is not valid' ),
 		) );
diff --git a/includes/api/ApiQueryImageInfo.php b/includes/api/ApiQueryImageInfo.php
index f8152d4a33..59c5657a63 100644
--- a/includes/api/ApiQueryImageInfo.php
+++ b/includes/api/ApiQueryImageInfo.php
@@ -533,7 +533,7 @@ class ApiQueryImageInfo extends ApiQueryBase {
 
 	/**
 	 * Return the API documentation for the parameters.
-	 * @return {Array} parameter documentation.
+	 * @return Array parameter documentation.
 	 */
 	public function getParamDescription() {
 		$p = $this->getModulePrefix();