From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Mon, 9 Dec 2013 13:47:13 +0000 (+0100)
Subject: Prevent fatal when File::transform() returns false
X-Git-Tag: 1.31.0-rc.0~17700
X-Git-Url: http://git.cyclocoop.org/wiki/Target_page?a=commitdiff_plain;h=47e893ca210a7f6d1db84dac30a6bbe3e624721b;p=lhc%2Fweb%2Fwiklou.git

Prevent fatal when File::transform() returns false

Bug: 58128
Change-Id: I115affb472bba99268575834de8cbf2d0318a32e
---

diff --git a/includes/Linker.php b/includes/Linker.php
index cb6129cb19..f303a17ec3 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -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();
 			}
 		}