Merge "avoid Title::exist/getArticleId in ApiQueryInfo::extractPageInfo"

diff --combined includes/api/ApiQueryInfo.php
index 2ff6197,e611ea8..a6c0ed5
--- 1/includes/api/ApiQueryInfo.php
--- 2/includes/api/ApiQueryInfo.php
+++ b/includes/api/ApiQueryInfo.php
@@@ -337,7 -337,10 +337,10 @@@ class ApiQueryInfo extends ApiQueryBas
         */
        private function extractPageInfo( $pageid, $title ) {
                $pageInfo = array();
-               if ( $title->exists() ) {
+               $titleExists = $pageid > 0; //$title->exists() needs pageid, which is not set for all title objects
+               $ns = $title->getNamespace();
+               $dbkey = $title->getDBkey();
+               if ( $titleExists ) {
                        global $wgDisableCounters;
  
                        $pageInfo['touched'] = wfTimestamp( TS_ISO_8601, $this->pageTouched[$pageid] );
@@@ -370,23 -373,23 +373,23 @@@
  
                if ( $this->fld_protection ) {
                        $pageInfo['protection'] = array();
-                       if ( isset( $this->protections[$title->getNamespace()][$title->getDBkey()] ) ) {
+                       if ( isset( $this->protections[$ns][$dbkey] ) ) {
                                $pageInfo['protection'] =
-                                       $this->protections[$title->getNamespace()][$title->getDBkey()];
+                                       $this->protections[$ns][$dbkey];
                        }
                        $this->getResult()->setIndexedTagName( $pageInfo['protection'], 'pr' );
                }
  
-               if ( $this->fld_watched && isset( $this->watched[$title->getNamespace()][$title->getDBkey()] ) ) {
+               if ( $this->fld_watched && isset( $this->watched[$ns][$dbkey] ) ) {
                        $pageInfo['watched'] = '';
                }
  
-               if ( $this->fld_talkid && isset( $this->talkids[$title->getNamespace()][$title->getDBkey()] ) ) {
-                       $pageInfo['talkid'] = $this->talkids[$title->getNamespace()][$title->getDBkey()];
+               if ( $this->fld_talkid && isset( $this->talkids[$ns][$dbkey] ) )        {
+                       $pageInfo['talkid'] = $this->talkids[$ns][$dbkey];
                }
  
-               if ( $this->fld_subjectid && isset( $this->subjectids[$title->getNamespace()][$title->getDBkey()] ) ) {
-                       $pageInfo['subjectid'] = $this->subjectids[$title->getNamespace()][$title->getDBkey()];
+               if ( $this->fld_subjectid && isset( $this->subjectids[$ns][$dbkey] ) ) {
+                       $pageInfo['subjectid'] = $this->subjectids[$ns][$dbkey];
                }
  
                if ( $this->fld_url ) {
@@@ -398,7 -401,7 +401,7 @@@
                }
  
                if ( $this->fld_preload ) {
-                       if ( $title->exists() ) {
+                       if ( $titleExists ) {
                                $pageInfo['preload'] = '';
                        } else {
                                $text = null;
@@@ -409,8 -412,8 +412,8 @@@
                }
  
                if ( $this->fld_displaytitle ) {
-                       if ( isset( $this->displaytitles[$title->getArticleID()] ) ) {
-                               $pageInfo['displaytitle'] = $this->displaytitles[$title->getArticleID()];
+                       if ( isset( $this->displaytitles[$pageid] ) ) {
+                               $pageInfo['displaytitle'] = $this->displaytitles[$pageid];
                        } else {
                                $pageInfo['displaytitle'] = $title->getPrefixedText();
                        }
@@@ -721,59 -724,6 +724,59 @@@
                );
        }
  
 +      public function getResultProperties() {
 +              $props = array(
 +                      ApiBase::PROP_LIST => false,
 +                      '' => array(
 +                              'touched' => 'timestamp',
 +                              'lastrevid' => 'integer',
 +                              'counter' => array(
 +                                      ApiBase::PROP_TYPE => 'integer',
 +                                      ApiBase::PROP_NULLABLE => true
 +                              ),
 +                              'length' => 'integer',
 +                              'redirect' => 'boolean',
 +                              'new' => 'boolean',
 +                              'starttimestamp' => array(
 +                                      ApiBase::PROP_TYPE => 'timestamp',
 +                                      ApiBase::PROP_NULLABLE => true
 +                              )
 +                      ),
 +                      'watched' => array(
 +                              'watched' => 'boolean'
 +                      ),
 +                      'talkid' => array(
 +                              'talkid' => array(
 +                                      ApiBase::PROP_TYPE => 'integer',
 +                                      ApiBase::PROP_NULLABLE => true
 +                              )
 +                      ),
 +                      'subjectid' => array(
 +                              'subjectid' => array(
 +                                      ApiBase::PROP_TYPE => 'integer',
 +                                      ApiBase::PROP_NULLABLE => true
 +                              )
 +                      ),
 +                      'url' => array(
 +                              'fullurl' => 'string',
 +                              'editurl' => 'string'
 +                      ),
 +                      'readable' => array(
 +                              'readable' => 'boolean'
 +                      ),
 +                      'preload' => array(
 +                              'preload' => 'string'
 +                      ),
 +                      'displaytitle' => array(
 +                              'displaytitle' => 'string'
 +                      )
 +              );
 +
 +              self::addTokenProperties( $props, $this->getTokenFunctions() );
 +
 +              return $props;
 +      }
 +
        public function getDescription() {
                return 'Get basic page information such as namespace, title, last touched date, ...';
        }