From: Sam Reed <reedy@users.mediawiki.org>
Date: Thu, 22 Jul 2010 10:18:41 +0000 (+0000)
Subject: Fixup r69719 per comments
X-Git-Tag: 1.31.0-rc.0~36013
X-Git-Url: http://git.cyclocoop.org/%24self?a=commitdiff_plain;h=83f8b93bd740756451c30f430e4e785e0c083379;p=lhc%2Fweb%2Fwiklou.git

Fixup r69719 per comments
---

diff --git a/includes/api/ApiQueryInfo.php b/includes/api/ApiQueryInfo.php
index 96f2bb92ac..12f47d35bc 100644
--- a/includes/api/ApiQueryInfo.php
+++ b/includes/api/ApiQueryInfo.php
@@ -364,7 +364,7 @@ class ApiQueryInfo extends ApiQueryBase {
 			if ( isset( $this->displaytitles[$title->getArticleId()] ) ) {
 				$pageInfo['displaytitle'] = $this->displaytitles[$title->getArticleId()];
 			} else {
-				$pageInfo['displaytitle'] = $title;
+				$pageInfo['displaytitle'] = $title->getPrefixedText();
 			}
 		}
 
@@ -556,11 +556,9 @@ class ApiQueryInfo extends ApiQueryBase {
 	}
 	
 	private function getDisplayTitle() {
-		$pageIds = $this->displaytitles = array();
+		$this->displaytitles = array();
 		
-		foreach ( $this->everything as $t ) {
-			$pageIds = $t->getArticleID();
-		}
+		$pageIds = array_keys( $this->titles );
 	
 		if ( !count( $pageIds ) ) {
 			return;