Commit stuff from my w/c
authorSam Reed <reedy@users.mediawiki.org>
Fri, 25 Feb 2011 16:53:33 +0000 (16:53 +0000)
committerSam Reed <reedy@users.mediawiki.org>
Fri, 25 Feb 2011 16:53:33 +0000 (16:53 +0000)
Remove white line

Make second if else if (they're opposites)

includes/api/ApiQueryImageInfo.php
includes/api/ApiQueryStashImageInfo.php

index f0e612a..2701730 100644 (file)
@@ -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();
                                }
                        }
index e829326..b145657 100644 (file)
@@ -78,7 +78,6 @@ class ApiQueryStashImageInfo extends ApiQueryImageInfo {
                );
        }
 
-
        public function getAllowedParams() {
                return array(
                        'sessionkey' => array(