From 3f659fb963f6d06e3b2da0b5aefbc3e7079772c4 Mon Sep 17 00:00:00 2001 From: Brian Wolff Date: Wed, 25 Jun 2014 21:48:16 -0300 Subject: [PATCH] Check for error before outputting srcset urls 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/Linker.php b/includes/Linker.php index 7d88f25c67..9e1bc5b5f3 100644 --- a/includes/Linker.php +++ b/includes/Linker.php @@ -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(); } } -- 2.20.1