Merge "Fix $wgSharedDB with sqlite"

[lhc/web/wiklou.git] / includes / api / ApiQueryImageInfo.php

diff --git a/includes/api/ApiQueryImageInfo.php b/includes/api/ApiQueryImageInfo.php
index b1df982..fd456cb 100644 (file)
--- a/includes/api/ApiQueryImageInfo.php
+++ b/includes/api/ApiQueryImageInfo.php
@@ -1,9 +1,5 @@
 <?php
 /**
- *
- *
- * Created on July 6, 2007
- *
  * Copyright © 2006 Yuri Astrakhan "<Firstname><Lastname>@gmail.com"
  *
  * This program is free software; you can redistribute it and/or modify
@@ -503,32 +499,36 @@ class ApiQueryImageInfo extends ApiQueryBase {
                }
 
                if ( $url ) {
-                       if ( !is_null( $thumbParams ) ) {
-                               $mto = $file->transform( $thumbParams );
-                               self::$transformCount++;
-                               if ( $mto && !$mto->isError() ) {
-                                       $vals['thumburl'] = wfExpandUrl( $mto->getUrl(), PROTO_CURRENT );
-
-                                       // T25834 - If the URLs are the same, we haven't resized it, so shouldn't give the wanted
-                                       // thumbnail sizes for the thumbnail actual size
-                                       if ( $mto->getUrl() !== $file->getUrl() ) {
-                                               $vals['thumbwidth'] = intval( $mto->getWidth() );
-                                               $vals['thumbheight'] = intval( $mto->getHeight() );
-                                       } else {
-                                               $vals['thumbwidth'] = intval( $file->getWidth() );
-                                               $vals['thumbheight'] = intval( $file->getHeight() );
-                                       }
+                       if ( $file->exists() ) {
+                               if ( !is_null( $thumbParams ) ) {
+                                       $mto = $file->transform( $thumbParams );
+                                       self::$transformCount++;
+                                       if ( $mto && !$mto->isError() ) {
+                                               $vals['thumburl'] = wfExpandUrl( $mto->getUrl(), PROTO_CURRENT );
+
+                                               // T25834 - If the URLs are the same, we haven't resized it, so shouldn't give the wanted
+                                               // thumbnail sizes for the thumbnail actual size
+                                               if ( $mto->getUrl() !== $file->getUrl() ) {
+                                                       $vals['thumbwidth'] = intval( $mto->getWidth() );
+                                                       $vals['thumbheight'] = intval( $mto->getHeight() );
+                                               } else {
+                                                       $vals['thumbwidth'] = intval( $file->getWidth() );
+                                                       $vals['thumbheight'] = intval( $file->getHeight() );
+                                               }
 
-                                       if ( isset( $prop['thumbmime'] ) && $file->getHandler() ) {
-                                               list( , $mime ) = $file->getHandler()->getThumbType(
-                                                       $mto->getExtension(), $file->getMimeType(), $thumbParams );
-                                               $vals['thumbmime'] = $mime;
+                                               if ( isset( $prop['thumbmime'] ) && $file->getHandler() ) {
+                                                       list( , $mime ) = $file->getHandler()->getThumbType(
+                                                               $mto->getExtension(), $file->getMimeType(), $thumbParams );
+                                                       $vals['thumbmime'] = $mime;
+                                               }
+                                       } elseif ( $mto && $mto->isError() ) {
+                                               $vals['thumberror'] = $mto->toText();
                                        }
-                               } elseif ( $mto && $mto->isError() ) {
-                                       $vals['thumberror'] = $mto->toText();
                                }
+                               $vals['url'] = wfExpandUrl( $file->getFullUrl(), PROTO_CURRENT );
+                       } else {
+                               $vals['filemissing'] = true;
                        }
-                       $vals['url'] = wfExpandUrl( $file->getFullUrl(), PROTO_CURRENT );
                        $vals['descriptionurl'] = wfExpandUrl( $file->getDescriptionUrl(), PROTO_CURRENT );
 
                        $shortDescriptionUrl = $file->getDescriptionShortUrl();