Index: trunk/phase3/includes/Linker.php |
— | — | @@ -459,7 +459,7 @@ |
460 | 460 | $frameParams['framed'] = true; |
461 | 461 | } |
462 | 462 | if ( $thumb ) { |
463 | | - $frameParams['thumb'] = true; |
| 463 | + $frameParams['thumbnail'] = true; |
464 | 464 | } |
465 | 465 | if ( $manualthumb ) { |
466 | 466 | $frameParams['manualthumb'] = $manualthumb; |
— | — | @@ -468,7 +468,7 @@ |
469 | 469 | $frameParams['valign'] = $valign; |
470 | 470 | } |
471 | 471 | $file = wfFindFile( $title, $time ); |
472 | | - return $this->makeImageLink2( $title, $file, $label, $alt, $frameParams, $handlerParams ); |
| 472 | + return $this->makeImageLink2( $title, $file, $frameParams, $handlerParams ); |
473 | 473 | } |
474 | 474 | |
475 | 475 | /** |
Index: trunk/phase3/RELEASE-NOTES |
— | — | @@ -420,6 +420,7 @@ |
421 | 421 | * Adding a newline before the statistics footer, to prevent parsing problems |
422 | 422 | * Preventing the TOC from appearing in Special:Statistics |
423 | 423 | * (bug 11082) Fix check for fully-specced table names in Database::tableName |
| 424 | +* (bug 11067) Fix regression in upload conflict thumbnail display |
424 | 425 | |
425 | 426 | |
426 | 427 | == API changes since 1.10 == |