From c05d05fb7586f2876a4c847d14c3435f2eada797 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Thu, 5 Dec 2013 13:55:04 +0100 Subject: [PATCH] Do not access MediaTransformOutput->url directly in Linker Use the available getUrl(). Also update parameter documentation. This will allow setting MediaTransformOutput::$url to protected in a following patch. Change-Id: I54dfbbc845d1fccd106afc7de1f06fa6e06f6a48 --- includes/Linker.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/includes/Linker.php b/includes/Linker.php index 7c6bbc6035..cb6129cb19 100644 --- a/includes/Linker.php +++ b/includes/Linker.php @@ -898,7 +898,7 @@ class Linker { * applicable. * * @param File $file - * @param MediaOutput $thumb + * @param MediaTransformOutput $thumb * @param array $hp image parameters */ public static function processResponsiveImages( $file, $thumb, $hp ) { @@ -915,11 +915,11 @@ class Linker { $thumb15 = $file->transform( $hp15 ); $thumb20 = $file->transform( $hp20 ); - if ( $thumb15->url !== $thumb->url ) { - $thumb->responsiveUrls['1.5'] = $thumb15->url; + if ( $thumb15->getUrl() !== $thumb->getUrl() ) { + $thumb->responsiveUrls['1.5'] = $thumb15->getUrl(); } - if ( $thumb20->url !== $thumb->url ) { - $thumb->responsiveUrls['2'] = $thumb20->url; + if ( $thumb20->getUrl() !== $thumb->getUrl() ) { + $thumb->responsiveUrls['2'] = $thumb20->getUrl(); } } } -- 2.20.1