Florianschmidtwelzow has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/163879

Change subject: Check for Nearby-Requirements first
......................................................................

Check for Nearby-Requirements first

Before add a nearby link into the main menu, check, if the
requirements are ok.

Bug: 70797
Change-Id: I8f3dc69676c095fcea35859f3a14363d59414617
---
M includes/skins/SkinMinerva.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend 
refs/changes/79/163879/1

diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 3bc102e..3746292 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -371,7 +371,7 @@
         * @param QuickTemplate $tpl
         */
        protected function prepareDiscoveryTools( QuickTemplate $tpl ) {
-               global $wgMFNearby, $wgMFContentNamespace;
+               global $wgMFNearby, $wgMFNearbyEndpoint, $wgMFContentNamespace;
 
                $items = array(
                        'home' => array(
@@ -406,7 +406,7 @@
                                'class' => 'jsonly',
                        ),
                );
-               if ( !$wgMFNearby ) {
+               if ( !$wgMFNearby || ( !$wgMFNearbyEndpoint && !class_exists( 
'GeoData' ) ) ) {
                        unset( $items['nearby'] );
                }
                $tpl->set( 'discovery_urls', $items );

-- 
To view, visit https://gerrit.wikimedia.org/r/163879
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8f3dc69676c095fcea35859f3a14363d59414617
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow <florian.schmidt.wel...@t-online.de>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to