Hello Daniel Kinzler, Tim Starling, Legoktm,
I'd like you to do a code review. Please visit
https://gerrit.wikimedia.org/r/383922
to review the following change.
Change subject: Update for deprecation of selectFields() methods
......................................................................
Update for deprecation of selectFields() methods
Various selectFields() methods were deprecated in MediaWiki core change
Idcfd1556. This change adapts the extension to use the replacement
getQueryInfo() methods when available.
Change-Id: I7b05a99e23da296a673eb0bd34f18344618c8be3
---
M includes/api/ApiQueryGeoSearch.php
1 file changed, 10 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GeoData
refs/changes/22/383922/1
diff --git a/includes/api/ApiQueryGeoSearch.php
b/includes/api/ApiQueryGeoSearch.php
index 227c6b3..7e00520 100644
--- a/includes/api/ApiQueryGeoSearch.php
+++ b/includes/api/ApiQueryGeoSearch.php
@@ -109,12 +109,20 @@
$this->dieDebug( __METHOD__, 'Logic error' );
}
- $this->addTables( 'page' );
// retrieve some fields only if page set needs them
if ( is_null( $resultPageSet ) ) {
+ $this->addTables( 'page' );
$this->addFields( [ 'page_id', 'page_namespace',
'page_title' ] );
} else {
- $this->addFields( WikiPage::selectFields() );
+ if ( is_callable( WikiPage::class, 'getQueryInfo' ) ) {
+ $pageQuery = WikiPage::getQueryInfo();
+ $this->addTables( $pageQuery['tables'] );
+ $this->addFields( $pageQuery['fields'] );
+ $this->addJoinConds( $pageQuery['joins'] );
+ } else {
+ $this->addTables( 'page' );
+ $this->addFields( WikiPage::selectFields() );
+ }
}
$this->addWhereFld( 'page_namespace', $params['namespace'] );
--
To view, visit https://gerrit.wikimedia.org/r/383922
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7b05a99e23da296a673eb0bd34f18344618c8be3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GeoData
Gerrit-Branch: master
Gerrit-Owner: Anomie <bjor...@wikimedia.org>
Gerrit-Reviewer: Daniel Kinzler <daniel.kinz...@wikimedia.de>
Gerrit-Reviewer: Legoktm <lego...@member.fsf.org>
Gerrit-Reviewer: Tim Starling <tstarl...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
