(bug 25832) query=allimages now outputs ns/title as well

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 689ceec..6716250 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -167,6 +167,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 26548) Add iiurlparam param to query=imageinfo and query=stashimageinfo
 * (bug 27205) aiprop=metadata and aiprop=parsedcomment need help text
 * Add a amtitle param to meta=allmessages
+* (bug 25832) query=allimages now outputs ns/title as well
 
 === Languages updated in 1.18 ===
 

diff --git a/includes/api/ApiQueryAllimages.php b/includes/api/ApiQueryAllimages.php
index 52cea73..1ae3417 100644 (file)
--- a/includes/api/ApiQueryAllimages.php
+++ b/includes/api/ApiQueryAllimages.php
@@ -136,6 +136,8 @@ class ApiQueryAllimages extends ApiQueryGeneratorBase {
                                $file = $repo->newFileFromRow( $row );
                                $info = array_merge( array( 'name' => $row->img_name ),
                                        ApiQueryImageInfo::getInfo( $file, $prop, $result ) );
+                               self::addTitleInfo( $info, $file->getTitle() ); 
+                                       
                                $fit = $result->addValue( array( 'query', $this->getModuleName() ), null, $info );
                                if ( !$fit ) {
                                        $this->setContinueEnumParameter( 'from', $this->keyToTitle( $row->img_name ) );