Nuke $db->freeResult() from Api stuffs

diff --git a/includes/api/ApiPageSet.php b/includes/api/ApiPageSet.php
index 7010d8f..554ae76 100644 (file)
--- a/includes/api/ApiPageSet.php
+++ b/includes/api/ApiPageSet.php
@@ -472,7 +472,6 @@ class ApiPageSet extends ApiQueryBase {
                        // Store any extra fields requested by modules
                        $this->processDbRow( $row );
                }
-               $db->freeResult( $res );
 
                if ( isset( $remaining ) ) {
                        // Any items left in the $remaining list are added as missing
@@ -527,7 +526,6 @@ class ApiPageSet extends ApiQueryBase {
                        $pageids[$pageid] = '';
                        unset( $remaining[$revid] );
                }
-               $db->freeResult( $res );
                $this->profileDBOut();
 
                $this->mMissingRevIDs = array_keys( $remaining );
@@ -606,7 +604,7 @@ class ApiPageSet extends ApiQueryBase {
                        }
                        $this->mRedirectTitles[$from] = $to;
                }
-               $db->freeResult( $res );
+
                if ( $this->mPendingRedirectIDs ) {
                        // We found pages that aren't in the redirect table
                        // Add them

diff --git a/includes/api/ApiQueryAllCategories.php b/includes/api/ApiQueryAllCategories.php
index cca846a..be2d9cf 100644 (file)
--- a/includes/api/ApiQueryAllCategories.php
+++ b/includes/api/ApiQueryAllCategories.php
@@ -117,7 +117,6 @@ class ApiQueryAllCategories extends ApiQueryGeneratorBase {
                                }
                        }
                }
-               $db->freeResult( $res );
 
                if ( is_null( $resultPageSet ) ) {
                        $result->setIndexedTagName_internal( array( 'query', $this->getModuleName() ), 'c' );

diff --git a/includes/api/ApiQueryAllLinks.php b/includes/api/ApiQueryAllLinks.php
index cf6d2ab..ced7e0c 100644 (file)
--- a/includes/api/ApiQueryAllLinks.php
+++ b/includes/api/ApiQueryAllLinks.php
@@ -145,7 +145,6 @@ class ApiQueryAllLinks extends ApiQueryGeneratorBase {
                                $pageids[] = $row->pl_from;
                        }
                }
-               $db->freeResult( $res );
 
                if ( is_null( $resultPageSet ) ) {
                        $result->setIndexedTagName_internal( array( 'query', $this->getModuleName() ), 'l' );

diff --git a/includes/api/ApiQueryAllUsers.php b/includes/api/ApiQueryAllUsers.php
index 85a203f..fcb8ba1 100644 (file)
--- a/includes/api/ApiQueryAllUsers.php
+++ b/includes/api/ApiQueryAllUsers.php
@@ -187,8 +187,6 @@ class ApiQueryAllUsers extends ApiQueryBase {
                        }
                }
 
-               $db->freeResult( $res );
-
                $result->setIndexedTagName_internal( array( 'query', $this->getModuleName() ), 'u' );
        }
 

diff --git a/includes/api/ApiQueryAllimages.php b/includes/api/ApiQueryAllimages.php
index 8692e1b..b8946e8 100644 (file)
--- a/includes/api/ApiQueryAllimages.php
+++ b/includes/api/ApiQueryAllimages.php
@@ -134,7 +134,6 @@ class ApiQueryAllimages extends ApiQueryGeneratorBase {
                                $titles[] = Title::makeTitle( NS_IMAGE, $row->img_name );
                        }
                }
-               $db->freeResult( $res );
 
                if ( is_null( $resultPageSet ) ) {
                        $result->setIndexedTagName_internal( array( 'query', $this->getModuleName() ), 'img' );

diff --git a/includes/api/ApiQueryAllpages.php b/includes/api/ApiQueryAllpages.php
index f9b503b..61f3414 100644 (file)
--- a/includes/api/ApiQueryAllpages.php
+++ b/includes/api/ApiQueryAllpages.php
@@ -174,7 +174,6 @@ class ApiQueryAllpages extends ApiQueryGeneratorBase {
                                $resultPageSet->processDbRow( $row );
                        }
                }
-               $db->freeResult( $res );
 
                if ( is_null( $resultPageSet ) ) {
                        $result->setIndexedTagName_internal( array( 'query', $this->getModuleName() ), 'p' );

diff --git a/includes/api/ApiQueryBacklinks.php b/includes/api/ApiQueryBacklinks.php
index a78bf08..4faba6f 100644 (file)
--- a/includes/api/ApiQueryBacklinks.php
+++ b/includes/api/ApiQueryBacklinks.php
@@ -232,7 +232,6 @@ class ApiQueryBacklinks extends ApiQueryGeneratorBase {
                                $resultPageSet->processDbRow( $row );
                        }
                }
-               $db->freeResult( $res );
 
                if ( $this->redirect && count( $this->redirTitles ) ) {
                        $this->resetQueryParams();
@@ -258,7 +257,6 @@ class ApiQueryBacklinks extends ApiQueryGeneratorBase {
                                        $resultPageSet->processDbRow( $row );
                                }
                        }
-                       $db->freeResult( $res );
                }
                if ( is_null( $resultPageSet ) ) {
                        // Try to add the result data in one go and pray that it fits

diff --git a/includes/api/ApiQueryCategories.php b/includes/api/ApiQueryCategories.php
index ff52598..fb7bd14 100644 (file)
--- a/includes/api/ApiQueryCategories.php
+++ b/includes/api/ApiQueryCategories.php
@@ -174,8 +174,6 @@ class ApiQueryCategories extends ApiQueryGeneratorBase {
                        }
                        $resultPageSet->populateFromTitles( $titles );
                }
-
-               $db->freeResult( $res );
        }
 
        public function getAllowedParams() {

diff --git a/includes/api/ApiQueryCategoryInfo.php b/includes/api/ApiQueryCategoryInfo.php
index f4f9522..17ddf0c 100644 (file)
--- a/includes/api/ApiQueryCategoryInfo.php
+++ b/includes/api/ApiQueryCategoryInfo.php
@@ -93,7 +93,6 @@ class ApiQueryCategoryInfo extends ApiQueryBase {
                                break;
                        }
                }
-               $db->freeResult( $res );
        }
 
        public function getAllowedParams() {

diff --git a/includes/api/ApiQueryCategoryMembers.php b/includes/api/ApiQueryCategoryMembers.php
index 774e596..479a804 100644 (file)
--- a/includes/api/ApiQueryCategoryMembers.php
+++ b/includes/api/ApiQueryCategoryMembers.php
@@ -160,7 +160,6 @@ class ApiQueryCategoryMembers extends ApiQueryGeneratorBase {
                        }
                        $lastSortKey = $row->cl_sortkey; // detect duplicate sortkeys
                }
-               $db->freeResult( $res );
 
                if ( is_null( $resultPageSet ) ) {
                        $this->getResult()->setIndexedTagName_internal(

diff --git a/includes/api/ApiQueryDeletedrevs.php b/includes/api/ApiQueryDeletedrevs.php
index 49bfafb..4740621 100644 (file)
--- a/includes/api/ApiQueryDeletedrevs.php
+++ b/includes/api/ApiQueryDeletedrevs.php
@@ -248,7 +248,6 @@ class ApiQueryDeletedrevs extends ApiQueryBase {
                                break;
                        }
                }
-               $db->freeResult( $res );
                $result->setIndexedTagName_internal( array( 'query', $this->getModuleName() ), 'page' );
        }
 

diff --git a/includes/api/ApiQueryDuplicateFiles.php b/includes/api/ApiQueryDuplicateFiles.php
index 6be546e..494ea09 100644 (file)
--- a/includes/api/ApiQueryDuplicateFiles.php
+++ b/includes/api/ApiQueryDuplicateFiles.php
@@ -121,7 +121,6 @@ class ApiQueryDuplicateFiles extends ApiQueryGeneratorBase {
                if ( !is_null( $resultPageSet ) ) {
                        $resultPageSet->populateFromTitles( $titles );
                }
-               $db->freeResult( $res );
        }
 
        public function getAllowedParams() {

diff --git a/includes/api/ApiQueryExtLinksUsage.php b/includes/api/ApiQueryExtLinksUsage.php
index 34e3c94..c17f0af 100644 (file)
--- a/includes/api/ApiQueryExtLinksUsage.php
+++ b/includes/api/ApiQueryExtLinksUsage.php
@@ -141,7 +141,6 @@ class ApiQueryExtLinksUsage extends ApiQueryGeneratorBase {
                                $resultPageSet->processDbRow( $row );
                        }
                }
-               $db->freeResult( $res );
 
                if ( is_null( $resultPageSet ) ) {
                        $result->setIndexedTagName_internal( array( 'query', $this->getModuleName() ),

diff --git a/includes/api/ApiQueryExternalLinks.php b/includes/api/ApiQueryExternalLinks.php
index 057ecfa..bc33f33 100644 (file)
--- a/includes/api/ApiQueryExternalLinks.php
+++ b/includes/api/ApiQueryExternalLinks.php
@@ -82,7 +82,6 @@ class ApiQueryExternalLinks extends ApiQueryBase {
                                break;
                        }
                }
-               $db->freeResult( $res );
        }
 
        public function getAllowedParams() {

diff --git a/includes/api/ApiQueryFilearchive.php b/includes/api/ApiQueryFilearchive.php
index 70c8a98..08a75e3 100644 (file)
--- a/includes/api/ApiQueryFilearchive.php
+++ b/includes/api/ApiQueryFilearchive.php
@@ -166,7 +166,6 @@ class ApiQueryFilearchive extends ApiQueryBase {
                                break;
                        }
                }
-               $db->freeResult( $res );
 
                $result->setIndexedTagName_internal( array( 'query', $this->getModuleName() ), 'fa' );
        }

diff --git a/includes/api/ApiQueryIWBacklinks.php b/includes/api/ApiQueryIWBacklinks.php
index 3324bfa..bc4c6cd 100644 (file)
--- a/includes/api/ApiQueryIWBacklinks.php
+++ b/includes/api/ApiQueryIWBacklinks.php
@@ -111,7 +111,6 @@ class ApiQueryIWBacklinks extends ApiQueryBase {
                                break;
                        }
                }
-               $db->freeResult( $res );
 
                $this->getResult()->setIndexedTagName_internal(
                        array( 'query', $this->getModuleName() ),

diff --git a/includes/api/ApiQueryIWLinks.php b/includes/api/ApiQueryIWLinks.php
index 7d13f07..b932c11 100644 (file)
--- a/includes/api/ApiQueryIWLinks.php
+++ b/includes/api/ApiQueryIWLinks.php
@@ -107,7 +107,6 @@ class ApiQueryIWLinks extends ApiQueryBase {
                                break;
                        }
                }
-               $db->freeResult( $res );
        }
 
        public function getAllowedParams() {

diff --git a/includes/api/ApiQueryImages.php b/includes/api/ApiQueryImages.php
index b6dfc1a..1804ce4 100644 (file)
--- a/includes/api/ApiQueryImages.php
+++ b/includes/api/ApiQueryImages.php
@@ -120,8 +120,6 @@ class ApiQueryImages extends ApiQueryGeneratorBase {
                        }
                        $resultPageSet->populateFromTitles( $titles );
                }
-
-               $db->freeResult( $res );
        }
 
        public function getAllowedParams() {

diff --git a/includes/api/ApiQueryInfo.php b/includes/api/ApiQueryInfo.php
index 88d2166..15bb1a8 100644 (file)
--- a/includes/api/ApiQueryInfo.php
+++ b/includes/api/ApiQueryInfo.php
@@ -416,7 +416,6 @@ class ApiQueryInfo extends ApiQueryBase {
                                        }
                                }
                        }
-                       $db->freeResult( $res );
                }
 
                // Get protections for missing titles
@@ -434,7 +433,6 @@ class ApiQueryInfo extends ApiQueryBase {
                                        'expiry' => Block::decodeExpiry( $row->pt_expiry, TS_ISO_8601 )
                                );
                        }
-                       $db->freeResult( $res );
                }
 
                // Cascading protections
@@ -470,7 +468,6 @@ class ApiQueryInfo extends ApiQueryBase {
                                        'source' => $source->getPrefixedText()
                                );
                        }
-                       $db->freeResult( $res );
                }
 
                if ( count( $images ) ) {
@@ -494,7 +491,6 @@ class ApiQueryInfo extends ApiQueryBase {
                                        'source' => $source->getPrefixedText()
                                );
                        }
-                       $db->freeResult( $res );
                }
        }
 

diff --git a/includes/api/ApiQueryLangLinks.php b/includes/api/ApiQueryLangLinks.php
index 10aad5a..d4fc38f 100644 (file)
--- a/includes/api/ApiQueryLangLinks.php
+++ b/includes/api/ApiQueryLangLinks.php
@@ -94,7 +94,6 @@ class ApiQueryLangLinks extends ApiQueryBase {
                                break;
                        }
                }
-               $db->freeResult( $res );
        }
 
        public function getAllowedParams() {

diff --git a/includes/api/ApiQueryLinks.php b/includes/api/ApiQueryLinks.php
index 202b772..5f5cf92 100644 (file)
--- a/includes/api/ApiQueryLinks.php
+++ b/includes/api/ApiQueryLinks.php
@@ -178,8 +178,6 @@ class ApiQueryLinks extends ApiQueryGeneratorBase {
                        }
                        $resultPageSet->populateFromTitles( $titles );
                }
-
-               $db->freeResult( $res );
        }
 
        public function getAllowedParams() {

diff --git a/includes/api/ApiQueryLogEvents.php b/includes/api/ApiQueryLogEvents.php
index 5d453ee..2858726 100644 (file)
--- a/includes/api/ApiQueryLogEvents.php
+++ b/includes/api/ApiQueryLogEvents.php
@@ -171,8 +171,6 @@ class ApiQueryLogEvents extends ApiQueryBase {
                                break;
                        }
                }
-               $db->freeResult( $res );
-
                $this->getResult()->setIndexedTagName_internal( array( 'query', $this->getModuleName() ), 'item' );
        }
 

diff --git a/includes/api/ApiQueryProtectedTitles.php b/includes/api/ApiQueryProtectedTitles.php
index 7f758fc..0162b88 100644 (file)
--- a/includes/api/ApiQueryProtectedTitles.php
+++ b/includes/api/ApiQueryProtectedTitles.php
@@ -123,7 +123,7 @@ class ApiQueryProtectedTitles extends ApiQueryGeneratorBase {
                                $titles[] = $title;
                        }
                }
-               $db->freeResult( $res );
+
                if ( is_null( $resultPageSet ) ) {
                        $result->setIndexedTagName_internal( array( 'query', $this->getModuleName() ), $this->getModulePrefix() );
                } else {

diff --git a/includes/api/ApiQueryRandom.php b/includes/api/ApiQueryRandom.php
index 85863ab..5085b9e 100644 (file)
--- a/includes/api/ApiQueryRandom.php
+++ b/includes/api/ApiQueryRandom.php
@@ -87,7 +87,7 @@ if ( !defined( 'MEDIAWIKI' ) ) {
                                $resultPageSet->processDbRow( $row );
                        }
                }
-               $db->freeResult( $res );
+
                return $count;
        }
 

diff --git a/includes/api/ApiQueryRecentChanges.php b/includes/api/ApiQueryRecentChanges.php
index abace8f..ae2bef0 100644 (file)
--- a/includes/api/ApiQueryRecentChanges.php
+++ b/includes/api/ApiQueryRecentChanges.php
@@ -273,8 +273,6 @@ class ApiQueryRecentChanges extends ApiQueryBase {
                        }
                }
 
-               $db->freeResult( $res );
-
                /* Format the result */
                $this->getResult()->setIndexedTagName_internal( array( 'query', $this->getModuleName() ), 'rc' );
        }

diff --git a/includes/api/ApiQueryRevisions.php b/includes/api/ApiQueryRevisions.php
index 0793826..93cc2a1 100644 (file)
--- a/includes/api/ApiQueryRevisions.php
+++ b/includes/api/ApiQueryRevisions.php
@@ -345,7 +345,6 @@ class ApiQueryRevisions extends ApiQueryBase {
                                break;
                        }
                }
-               $db->freeResult( $res );
        }
 
        private function extractRowInfo( $row ) {

diff --git a/includes/api/ApiQuerySiteinfo.php b/includes/api/ApiQuerySiteinfo.php
index 5ec4e32..f4e6645 100644 (file)
--- a/includes/api/ApiQuerySiteinfo.php
+++ b/includes/api/ApiQuerySiteinfo.php
@@ -271,7 +271,6 @@ class ApiQuerySiteinfo extends ApiQueryBase {
 
                        $data[] = $val;
                }
-               $db->freeResult( $res );
 
                $this->getResult()->setIndexedTagName( $data, 'iw' );
                return $this->getResult()->addValue( 'query', $property, $data );

diff --git a/includes/api/ApiQueryUserContributions.php b/includes/api/ApiQueryUserContributions.php
index 24a03b7..a337c1d 100644 (file)
--- a/includes/api/ApiQueryUserContributions.php
+++ b/includes/api/ApiQueryUserContributions.php
@@ -114,9 +114,6 @@ class ApiQueryContributions extends ApiQueryBase {
                        }
                }
 
-               // Free the database record so the connection can get on with other stuff
-               $db->freeResult( $res );
-
                $this->getResult()->setIndexedTagName_internal( array( 'query', $this->getModuleName() ), 'item' );
        }
 

diff --git a/includes/api/ApiQueryWatchlist.php b/includes/api/ApiQueryWatchlist.php
index 4482485..b02f6ec 100644 (file)
--- a/includes/api/ApiQueryWatchlist.php
+++ b/includes/api/ApiQueryWatchlist.php
@@ -202,8 +202,6 @@ class ApiQueryWatchlist extends ApiQueryGeneratorBase {
                        }
                }
 
-               $db->freeResult( $res );
-
                if ( is_null( $resultPageSet ) ) {
                        $this->getResult()->setIndexedTagName_internal( array( 'query', $this->getModuleName() ), 'item' );
                } elseif ( $params['allrev'] ) {