From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Sat, 27 Sep 2008 11:04:23 +0000 (+0000)
Subject: API: Add the name attribute back to list=allimages; it disappeared in r35085
X-Git-Tag: 1.31.0-rc.0~45071
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/password.php?a=commitdiff_plain;h=26c2b5264d78ce836369d26167eb98f1e48d8e4c;p=lhc%2Fweb%2Fwiklou.git

API: Add the name attribute back to list=allimages; it disappeared in r35085
---

diff --git a/includes/api/ApiQueryAllimages.php b/includes/api/ApiQueryAllimages.php
index 2754c25862..8b513f34a6 100644
--- a/includes/api/ApiQueryAllimages.php
+++ b/includes/api/ApiQueryAllimages.php
@@ -109,10 +109,10 @@ class ApiQueryAllimages extends ApiQueryGeneratorBase {
 
 			if (is_null($resultPageSet)) {
 				$file = $repo->newFileFromRow( $row );
-
-				$data[] = ApiQueryImageInfo::getInfo( $file, $prop, $result );
+				$data[] = array_merge(array('name' => $row->img_name),
+					ApiQueryImageInfo::getInfo($file, $prop, $result));
 			} else {
-				$data[] = Title::makeTitle( NS_IMAGE, $row->img_name );
+				$data[] = Title::makeTitle(NS_IMAGE, $row->img_name);
 			}
 		}
 		$db->freeResult($res);