Prevent fatal when File::transform() returns false
authorSiebrand Mazeland <s.mazeland@xs4all.nl>
Mon, 9 Dec 2013 13:47:13 +0000 (14:47 +0100)
committerSiebrand <siebrand@wikimedia.org>
Mon, 9 Dec 2013 13:49:46 +0000 (13:49 +0000)
Bug: 58128
Change-Id: I115affb472bba99268575834de8cbf2d0318a32e

includes/Linker.php

index cb6129c..f303a17 100644 (file)
@@ -915,10 +915,10 @@ class Linker {
 
                        $thumb15 = $file->transform( $hp15 );
                        $thumb20 = $file->transform( $hp20 );
-                       if ( $thumb15->getUrl() !== $thumb->getUrl() ) {
+                       if ( $thumb15 && $thumb15->getUrl() !== $thumb->getUrl() ) {
                                $thumb->responsiveUrls['1.5'] = $thumb15->getUrl();
                        }
-                       if ( $thumb20->getUrl() !== $thumb->getUrl() ) {
+                       if ( $thumb20 && $thumb20->getUrl() !== $thumb->getUrl() ) {
                                $thumb->responsiveUrls['2'] = $thumb20->getUrl();
                        }
                }