(bug 13606) Added archivename to iiprop

[lhc/web/wiklou.git] / includes / api / ApiQueryImageInfo.php

diff --git a/includes/api/ApiQueryImageInfo.php b/includes/api/ApiQueryImageInfo.php
index 5a2a32d..69cc3a9 100644 (file)
--- a/includes/api/ApiQueryImageInfo.php
+++ b/includes/api/ApiQueryImageInfo.php
@@ -50,6 +50,7 @@ class ApiQueryImageInfo extends ApiQueryBase {
                $this->fld_size = isset($prop['size']);
                $this->fld_sha1 = isset($prop['sha1']);
                $this->fld_metadata = isset($prop['metadata']);
+               $this->fld_archivename = isset($prop['archivename']);
                
                if($params['urlheight'] != -1 && $params['urlwidth'] == -1)
                        $this->dieUsage("iiurlheight cannot be used without iiurlwidth", 'iiurlwidth');
@@ -79,11 +80,18 @@ class ApiQueryImageInfo extends ApiQueryBase {
                                        }
                                        
                                        // Now get the old revisions
-                                       if($params['limit'] > count($data)) {
-                                               $oldies = $img->getHistory($params['limit'] - count($data), $params['start'], $params['end']);
-                                               if(!empty($oldies))
-                                                       foreach($oldies as $oldie)
-                                                               $data[] = $this->getInfo($oldie);
+                                       // Get one more to facilitate query-continue functionality
+                                       $count = count($data);
+                                       $oldies = $img->getHistory($params['limit'] - $count + 1, $params['start'], $params['end']);
+                                       foreach($oldies as $oldie) {
+                                               if(++$count > $params['limit']) {
+                                                       // We've reached the extra one which shows that there are additional pages to be had. Stop here...
+                                                       // Only set a query-continue if there was only one title
+                                                       if(count($pageIds[NS_IMAGE]) == 1)
+                                                               $this->setContinueEnumParameter('start', $oldie->getTimestamp());
+                                                       break;
+                                               }
+                                               $data[] = $this->getInfo($oldie);       
                                        }
                                }
 
@@ -137,6 +145,9 @@ class ApiQueryImageInfo extends ApiQueryBase {
                        $vals['metadata'] = $metadata ? $metadata : null;
                        $this->getResult()->setIndexedTagName_recursive($vals['metadata'], 'meta');
                }
+               if($this->fld_archivename && $f->isOld())
+                       $vals['archivename'] = $f->getArchiveName();
+               
                return $vals;
        }
 
@@ -152,7 +163,8 @@ class ApiQueryImageInfo extends ApiQueryBase {
                                        'url',
                                        'size',
                                        'sha1',
-                                       'metadata'
+                                       'metadata',
+                                       'archivename'
                                )
                        ),
                        'limit' => array(