From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Wed, 23 Sep 2009 20:55:54 +0000 (+0000)
Subject: API: Handle image redirects properly in imageinfo, based on reports of API requests... 
X-Git-Tag: 1.31.0-rc.0~39553
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/ajouter.php?a=commitdiff_plain;h=6d638b24cbd42c17981889802786f305cae39d75;p=lhc%2Fweb%2Fwiklou.git

API: Handle image redirects properly in imageinfo, based on reports of API requests dying with backtraces on Commons, e.g. commons.wikimedia.org/w/api.php?action=query&prop=imageinfo&iiprop=user&titles=File:Semaphore_Alfa.svg
---

diff --git a/includes/api/ApiQueryImageInfo.php b/includes/api/ApiQueryImageInfo.php
index 3494f9134c..aa08ae0363 100644
--- a/includes/api/ApiQueryImageInfo.php
+++ b/includes/api/ApiQueryImageInfo.php
@@ -81,6 +81,10 @@ class ApiQueryImageInfo extends ApiQueryBase {
 			$result = $this->getResult();
 			$images = RepoGroup::singleton()->findFiles( $titles );
 			foreach ( $images as $img ) {
+				// Skip redirects
+				if($img->getOriginalTitle()->isRedirect())
+					continue;
+				
 				$start = $skip ? $fromTimestamp : $params['start'];
 				$pageId = $pageIds[NS_IMAGE][ $img->getOriginalTitle()->getDBkey() ];
 
@@ -158,13 +162,14 @@ class ApiQueryImageInfo extends ApiQueryBase {
 				$skip = false;
 			}
 			
-			$missing = array_diff( array_keys( $pageIds[NS_FILE] ), array_keys( $images ) );
-			foreach ($missing as $title) {
-				$result->addValue(
-					array('query', 'pages', intval($pageIds[NS_FILE][$title])),
-					'imagerepository', ''
-				);
-				// The above can't fail because it doesn't increase the result size
+			$data = $this->getResultData();
+			foreach($data['query']['pages'] as $pageid => $arr) {
+				if(!isset($arr['imagerepository']))
+					$result->addValue(
+						array('query', 'pages', $pageid),
+						'imagerepository', ''
+					);
+					// The above can't fail because it doesn't increase the result size
 			}
 		}
 	}