Merge "Check for error before outputting srcset urls"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 28 Aug 2014 07:35:17 +0000 (07:35 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 28 Aug 2014 07:35:17 +0000 (07:35 +0000)
includes/Linker.php

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