Honor transform limit for images with many old revisions
authorBrad Jorsch <bjorsch@wikimedia.org>
Wed, 3 Apr 2013 16:03:44 +0000 (12:03 -0400)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 9 Apr 2013 22:56:55 +0000 (22:56 +0000)
When preparing Id0ec6a0a, for some reason I thought the thumbnailing
only applied to the current revision. Fix that oversight.

Change-Id: I2e8aecc76a1190bac353a2b9855bc6a19ec06dec

includes/api/ApiQueryImageInfo.php

index b2ef048..87bdbfe 100644 (file)
@@ -170,9 +170,12 @@ class ApiQueryImageInfo extends ApiQueryBase {
                                                }
                                                break;
                                        }
-                                       $fit = $this->addPageSubItem( $pageId,
-                                               self::getInfo( $oldie, $prop, $result,
-                                                       $finalThumbParams, $params['metadataversion'] ) );
+                                       $fit = self::getTransformCount() < self::TRANSFORM_LIMIT &&
+                                               $this->addPageSubItem( $pageId,
+                                                       self::getInfo( $oldie, $prop, $result,
+                                                               $finalThumbParams, $params['metadataversion']
+                                                       )
+                                               );
                                        if ( !$fit ) {
                                                if ( count( $pageIds[NS_FILE] ) == 1 ) {
                                                        $this->setContinueEnumParameter( 'start',