| Index: branches/REL1_17/phase3/includes/api/ApiQueryImageInfo.php |
| — | — | @@ -283,8 +283,8 @@ |
| 284 | 284 | } |
| 285 | 285 | |
| 286 | 286 | 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'] ) ); |
| 289 | 289 | if ( $mto && !$mto->isError() ) { |
| 290 | 290 | $vals['thumburl'] = wfExpandUrl( $mto->getUrl() ); |
| 291 | 291 | |
| Property changes on: branches/REL1_17/phase3/includes/api/ApiQueryImageInfo.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 292 | 292 | Merged /branches/wmf/1.17wmf1/includes/api/ApiQueryImageInfo.php:r82960 |