Name variables that store VisitorGeolocator instances to visitorGeolocator instead of locationFetcher.

1 files changed, 7 insertions, 9 deletions

diff --git a/plugins/UserCountry/Columns/Base.php b/plugins/UserCountry/Columns/Base.php
index d28db0e426..d0a3b58118 100644
--- a/plugins/UserCountry/Columns/Base.php
+++ b/plugins/UserCountry/Columns/Base.php
@@ -23,7 +23,7 @@ abstract class Base extends VisitDimension
     /**
      * @var VisitorGeolocator
      */
-    private $locationFetcher;
+    private $visitorGeolocator;
 
     protected function getUrlOverrideValueIfAllowed($urlParamToOverride, Request $request)
     {
@@ -46,10 +46,8 @@ abstract class Base extends VisitDimension
 
     protected function getLocationDetail($userInfo, $locationKey)
     {
-        $location = $this->getLocationFetcher()->getLocation(
-            $userInfo,
-            empty($GLOBALS['PIWIK_TRACKER_LOCAL_TRACKING'])
-        );
+        $useLocationCache = empty($GLOBALS['PIWIK_TRACKER_LOCAL_TRACKING']);
+        $location = $this->getVisitorGeolocator()->getLocation($userInfo, $useLocationCache);
 
         if (!isset($location[$locationKey])) {
             return false;
@@ -58,13 +56,13 @@ abstract class Base extends VisitDimension
         return $location[$locationKey];
     }
 
-    protected function getLocationFetcher()
+    protected function getVisitorGeolocator()
     {
-        if ($this->locationFetcher === null) {
-            $this->locationFetcher = new VisitorGeolocator();
+        if ($this->visitorGeolocator === null) {
+            $this->visitorGeolocator = new VisitorGeolocator();
         }
 
-        return $this->locationFetcher;
+        return $this->visitorGeolocator;
     }
 
     protected function getUserInfo(Request $request, Visitor $visitor)