r82960 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r82959‎ | r82960 | r82961 >
Date:21:01, 28 February 2011
Author:catrope
Status:ok
Tags:
Comment:
1.17wmf1: Attempting to fix botched merge in r82820
Modified paths:
  • /branches/wmf/1.17wmf1/includes/api/ApiQueryImageInfo.php (modified) (history)

Diff [purge]

Index: branches/wmf/1.17wmf1/includes/api/ApiQueryImageInfo.php
@@ -283,8 +283,8 @@
284284 }
285285
286286 if ( $url ) {
287 - if ( !is_null( $thumbParams ) ) {
288 - $mto = $file->transform( $thumbParams );
 287+ if ( !is_null( $scale ) && !$file->isOld() ) {
 288+ $mto = $file->transform( array( 'width' => $scale['width'], 'height' => $scale['height'] ) );
289289 if ( $mto && !$mto->isError() ) {
290290 $vals['thumburl'] = wfExpandUrl( $mto->getUrl() );
291291

Follow-up revisions

RevisionCommit summaryAuthorDate
r82961Merge r82960 to REL1_17, fixing r82819reedy21:08, 28 February 2011

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r82820MFT r82810, r82813, r82814, r82815, r82818reedy21:46, 25 February 2011

Status & tagging log