Check for error before outputting srcset urls
authorBrian Wolff <bawolff+wn@gmail.com>
Thu, 26 Jun 2014 00:48:16 +0000 (21:48 -0300)
committerBrian Wolff <bawolff+wn@gmail.com>
Thu, 26 Jun 2014 00:48:16 +0000 (21:48 -0300)
If $thumb returns a MediaTransformError object, then $thumb->getUrl()
will return false, which will result in srcset="1.5x, 2x".

Bug: 67081
Change-Id: Idb6bbff6995536d20dac67ce12592f68f6d1235a

includes/Linker.php

index 7d88f25..9e1bc5b 100644 (file)
@@ -913,10 +913,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();
                        }
                }