From 48969992a6c803d1b07c2eff56373680ccfabd49 Mon Sep 17 00:00:00 2001
From: Matthieu Aubry <mattab@users.noreply.github.com>
Date: Fri, 25 May 2018 08:34:12 +0200
Subject: Move provider visibility check to UI only (#12959)

That should allow setting and using invisible geolocation providers without problems
---
 plugins/UserCountry/LocationProvider.php      | 5 ++---
 plugins/UserCountry/templates/adminIndex.twig | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/plugins/UserCountry/LocationProvider.php b/plugins/UserCountry/LocationProvider.php
index fbce30bc35..2ca4807696 100755
--- a/plugins/UserCountry/LocationProvider.php
+++ b/plugins/UserCountry/LocationProvider.php
@@ -170,9 +170,7 @@ abstract class LocationProvider
             $plugins   = PluginManager::getInstance()->getPluginsLoadedAndActivated();
             foreach ($plugins as $plugin) {
                 foreach (self::getLocationProviders($plugin) as $instance) {
-                    if ($instance->isVisible()) {
-                        self::$providers[] = $instance;
-                    }
+                    self::$providers[] = $instance;
                 }
             }
         }
@@ -280,6 +278,7 @@ abstract class LocationProvider
             $info['status'] = $status;
             $info['statusMessage'] = $statusMessage;
             $info['location'] = $location;
+            $info['isVisible'] = $provider->isVisible();
 
             $allInfo[$info['order']] = $info;
         }
diff --git a/plugins/UserCountry/templates/adminIndex.twig b/plugins/UserCountry/templates/adminIndex.twig
index 653e2b1561..e8f155342c 100755
--- a/plugins/UserCountry/templates/adminIndex.twig
+++ b/plugins/UserCountry/templates/adminIndex.twig
@@ -30,7 +30,7 @@
         <div class="col s12 push-m9 m3">{{ 'General_InfoFor'|translate(thisIP) }}</div>
     </div>
 
-    {% for id,provider in locationProviders %}
+    {% for id,provider in locationProviders if provider.isVisible %}
     <div class="row form-group provider{{ id|e('html_attr') }}">
         <div class="col s12 m4 l2">
             <p>
-- 
cgit v1.2.3