From 90cc625f0364e89af32159068b5cc25a2e03a063 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Mon, 27 Aug 2007 20:10:48 +0000 Subject: [PATCH] * (bug 11067) Fix regression in upload conflict thumbnail display Wildly incorrect data was getting passed through the Linker makeImageLinkObj -> makeImageLink2 -> makeThumbLink2 path, breaking certain thumb rendering as used by the special:upload ajax thingybob --- RELEASE-NOTES | 1 + includes/Linker.php | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index cb2b838a23..cb9ecad209 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -420,6 +420,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN * Adding a newline before the statistics footer, to prevent parsing problems * Preventing the TOC from appearing in Special:Statistics * (bug 11082) Fix check for fully-specced table names in Database::tableName +* (bug 11067) Fix regression in upload conflict thumbnail display == API changes since 1.10 == diff --git a/includes/Linker.php b/includes/Linker.php index 18dc188785..35951d5166 100644 --- a/includes/Linker.php +++ b/includes/Linker.php @@ -459,7 +459,7 @@ class Linker { $frameParams['framed'] = true; } if ( $thumb ) { - $frameParams['thumb'] = true; + $frameParams['thumbnail'] = true; } if ( $manualthumb ) { $frameParams['manualthumb'] = $manualthumb; @@ -468,7 +468,7 @@ class Linker { $frameParams['valign'] = $valign; } $file = wfFindFile( $title, $time ); - return $this->makeImageLink2( $title, $file, $label, $alt, $frameParams, $handlerParams ); + return $this->makeImageLink2( $title, $file, $frameParams, $handlerParams ); } /** -- 2.20.1