Clarify thumbnail log failure entries when the local file copy failed
authorAaron Schulz <aschulz@wikimedia.org>
Fri, 8 Nov 2013 19:23:17 +0000 (11:23 -0800)
committerBryanDavis <bdavis@wikimedia.org>
Fri, 8 Nov 2013 20:52:12 +0000 (20:52 +0000)
Change-Id: I8ed9a5ffc04b1abd2e7b2c055dfdfb2625e89fde

includes/media/Bitmap.php

index e2444a1..43ba117 100644 (file)
@@ -168,6 +168,13 @@ class BitmapHandler extends ImageHandler {
 
                # Transform functions and binaries need a FS source file
                $scalerParams['srcPath'] = $image->getLocalRefPath();
+               if ( $scalerParams['srcPath'] === false ) { // Failed to get local copy
+                       wfDebugLog( 'thumbnail',
+                               sprintf( 'Thumbnail failed on %s: could not get local copy of "%s"',
+                                       wfHostname(), $image->getName() ) );
+                       return new MediaTransformError( 'thumbnail_error',
+                               $scalerParams['clientWidth'], $scalerParams['clientHeight'] );
+               }
 
                # Try a hook
                $mto = null;