From: Sam Reed <reedy@users.mediawiki.org>
Date: Fri, 25 Feb 2011 16:53:33 +0000 (+0000)
Subject: Commit stuff from my w/c
X-Git-Tag: 1.31.0-rc.0~31775
X-Git-Url: https://git.cyclocoop.org/?a=commitdiff_plain;h=442bec4f9bb83ccaeaccca4588e309c9777970ca;p=lhc%2Fweb%2Fwiklou.git

Commit stuff from my w/c

Remove white line

Make second if else if (they're opposites)
---

diff --git a/includes/api/ApiQueryImageInfo.php b/includes/api/ApiQueryImageInfo.php
index f0e612a56a..2701730394 100644
--- a/includes/api/ApiQueryImageInfo.php
+++ b/includes/api/ApiQueryImageInfo.php
@@ -312,8 +312,7 @@ class ApiQueryImageInfo extends ApiQueryBase {
 						$thumbFile = UnregisteredLocalFile::newFromPath( $mto->getPath(), false );
 						$vals['thumbmime'] = $thumbFile->getMimeType();
 					}
-				}
-				if ( $mto && $mto->isError() ) {
+				} else if ( $mto && $mto->isError() ) {
 					$vals['thumberror'] = $mto->toText();
 				}
 			}
diff --git a/includes/api/ApiQueryStashImageInfo.php b/includes/api/ApiQueryStashImageInfo.php
index e82932629b..b145657c17 100644
--- a/includes/api/ApiQueryStashImageInfo.php
+++ b/includes/api/ApiQueryStashImageInfo.php
@@ -78,7 +78,6 @@ class ApiQueryStashImageInfo extends ApiQueryImageInfo {
 		);
 	}
 
-
 	public function getAllowedParams() {
 		return array(
 			'sessionkey' => array(