MaxSem has uploaded a new change for review.
https://gerrit.wikimedia.org/r/262728
Change subject: Rm b/c code
......................................................................
Rm b/c code
Change-Id: Ie87101b4650b5d54942085526efe22aa63061dfc
---
M includes/GeoDataHooks.php
1 file changed, 3 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GeoData
refs/changes/28/262728/1
diff --git a/includes/GeoDataHooks.php b/includes/GeoDataHooks.php
index 37c9578..4280ec4 100644
--- a/includes/GeoDataHooks.php
+++ b/includes/GeoDataHooks.php
@@ -271,13 +271,8 @@
if ( !$wgGeoDataUseCirrusSearch && $wgGeoDataBackend !=
'elastic' ) {
return true;
}
- if ( isset( $config[ 'page' ] ) ) {
- // Post CirrusSearch
I2d92dc973a66180dc39c646254ce9b11ec269edc
- $pageConfig = $config[ 'page' ];
- } else {
- // Pre CirrusSearch
I2d92dc973a66180dc39c646254ce9b11ec269edc
- $pageConfig = $config;
- }
+ $pageConfig = $config['page'];
+
$pageConfig['properties']['coordinates'] = array(
'type' => 'nested',
'properties' => array(
@@ -300,13 +295,7 @@
'precision' => $wgGeoDataCoordinatesCompression,
);
}
- if ( isset( $config[ 'page' ] ) ) {
- // Post CirrusSearch
I2d92dc973a66180dc39c646254ce9b11ec269edc
- $config[ 'page' ] = $pageConfig;
- } else {
- // Pre CirrusSearch
I2d92dc973a66180dc39c646254ce9b11ec269edc
- $config = $pageConfig;
- }
+ $config['page'] = $pageConfig;
return true;
}
--
To view, visit https://gerrit.wikimedia.org/r/262728
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie87101b4650b5d54942085526efe22aa63061dfc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GeoData
Gerrit-Branch: master
Gerrit-Owner: MaxSem <maxsem.w...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
