r25208 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r25207‎ | r25208 | r25209 >
Date:20:10, 27 August 2007
Author:brion
Status:old
Tags:
Comment:
* (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
Modified paths:
  • /trunk/phase3/RELEASE-NOTES (modified) (history)
  • /trunk/phase3/includes/Linker.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/Linker.php
@@ -459,7 +459,7 @@
460460 $frameParams['framed'] = true;
461461 }
462462 if ( $thumb ) {
463 - $frameParams['thumb'] = true;
 463+ $frameParams['thumbnail'] = true;
464464 }
465465 if ( $manualthumb ) {
466466 $frameParams['manualthumb'] = $manualthumb;
@@ -468,7 +468,7 @@
469469 $frameParams['valign'] = $valign;
470470 }
471471 $file = wfFindFile( $title, $time );
472 - return $this->makeImageLink2( $title, $file, $label, $alt, $frameParams, $handlerParams );
 472+ return $this->makeImageLink2( $title, $file, $frameParams, $handlerParams );
473473 }
474474
475475 /**
Index: trunk/phase3/RELEASE-NOTES
@@ -420,6 +420,7 @@
421421 * Adding a newline before the statistics footer, to prevent parsing problems
422422 * Preventing the TOC from appearing in Special:Statistics
423423 * (bug 11082) Fix check for fully-specced table names in Database::tableName
 424+* (bug 11067) Fix regression in upload conflict thumbnail display
424425
425426
426427 == API changes since 1.10 ==

Follow-up revisions

RevisionCommit summaryAuthorDate
r25223Merged revisions 25126-25214 via svnmerge from...david07:39, 28 August 2007

Status & tagging log