http://www.mediawiki.org/wiki/Special:Code/MediaWiki/72387

Revision: 72387
Author:   platonides
Date:     2010-09-04 18:31:37 +0000 (Sat, 04 Sep 2010)

Log Message:
-----------
Make happy check-vars. This shows it that getQuery() returns an ApiQuery (more 
specifically, that getQuery() doesn't return an article)

Modified Paths:
--------------
    trunk/phase3/includes/api/ApiQueryBase.php

Modified: trunk/phase3/includes/api/ApiQueryBase.php
===================================================================
--- trunk/phase3/includes/api/ApiQueryBase.php  2010-09-04 18:30:22 UTC (rev 
72386)
+++ trunk/phase3/includes/api/ApiQueryBase.php  2010-09-04 18:31:37 UTC (rev 
72387)
@@ -40,7 +40,7 @@
 
        private $mQueryModule, $mDb, $tables, $where, $fields, $options, 
$join_conds;
 
-       public function __construct( $query, $moduleName, $paramPrefix = '' ) {
+       public function __construct( ApiQuery $query, $moduleName, $paramPrefix 
= '' ) {
                parent::__construct( $query->getMain(), $moduleName, 
$paramPrefix );
                $this->mQueryModule = $query;
                $this->mDb = null;
@@ -361,7 +361,8 @@
         */
        protected function getDB() {
                if ( is_null( $this->mDb ) ) {
-                       $this->mDb = $this->getQuery()->getDB();
+                       $apiQuery = $this->getQuery();
+                       $this->mDb = $apiQuery->getDB();
                }
                return $this->mDb;
        }



_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to