(bug 26125) prop=imageinfo&iiprop=size now returns the page count if the file is...

Also fix blatant lie in File::pageCount()

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 7a237c2..8959b6b 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -537,6 +537,8 @@ LocalSettings.php. The specific bugs are listed below in the general notes.
 * (bug 26006) prop=langlinks now allows obtaining full URL
 * (bug 26075) ApiDelete.php now calls correctly ArticleDelete hook
 * (bug 26089) add block expiration to blockinfo
+* (bug 26125) prop=imageinfo&iiprop=size now returns the page count if the 
+  file is a multi-page file
 
 === Languages updated in 1.17 ===
 

diff --git a/includes/api/ApiQueryImageInfo.php b/includes/api/ApiQueryImageInfo.php
index 11ec5e0..187e65f 100644 (file)
--- a/includes/api/ApiQueryImageInfo.php
+++ b/includes/api/ApiQueryImageInfo.php
@@ -230,6 +230,11 @@ class ApiQueryImageInfo extends ApiQueryBase {
                        $vals['size'] = intval( $file->getSize() );
                        $vals['width'] = intval( $file->getWidth() );
                        $vals['height'] = intval( $file->getHeight() );
+                       
+                       $pageCount = $file->pageCount();
+                       if ( $pageCount !== false ) {
+                               $vals['pagecount'] = $pageCount;
+                       }
                }
                if ( isset( $prop['url'] ) ) {
                        if ( !is_null( $scale ) && !$file->isOld() ) {

diff --git a/includes/filerepo/File.php b/includes/filerepo/File.php
index 0ba402f..65d7e79 100644 (file)
--- a/includes/filerepo/File.php
+++ b/includes/filerepo/File.php
@@ -1049,7 +1049,7 @@ abstract class File {
        }
 
        /**
-        * Returns the number of pages of a multipage document, or NULL for
+        * Returns the number of pages of a multipage document, or false for
         * documents which aren't multipage documents
         */
        function pageCount() {