Fixup r69719 per comments
authorSam Reed <reedy@users.mediawiki.org>
Thu, 22 Jul 2010 10:18:41 +0000 (10:18 +0000)
committerSam Reed <reedy@users.mediawiki.org>
Thu, 22 Jul 2010 10:18:41 +0000 (10:18 +0000)
includes/api/ApiQueryInfo.php

index 96f2bb9..12f47d3 100644 (file)
@@ -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;