By default, use the RAW non-anonimised ip when geo locating IPs.

This prevents wrong geo location by default and should make users less confused.
matomo-org · Feb 18, 2015 · 4e18d76 · 4e18d76 · mattab · Feb 18, 2015
1 parent b1e99c6
commit 4e18d76
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/plugins/PrivacyManager/Config.php b/plugins/PrivacyManager/Config.php
@@ -27,7 +27,7 @@
 class Config
 {
     private $properties = array(
-        'useAnonymizedIpForVisitEnrichment' => array('type' => 'boolean', 'default' => true),
+        'useAnonymizedIpForVisitEnrichment' => array('type' => 'boolean', 'default' => false),
         'ipAddressMaskLength'               => array('type' => 'integer', 'default' => 2),
         'doNotTrackEnabled'                 => array('type' => 'boolean', 'default' => true),
         'ipAnonymizerEnabled'               => array('type' => 'boolean', 'default' => true),

diff --git a/plugins/PrivacyManager/tests/Integration/PrivacyManagerConfigTest.php b/plugins/PrivacyManager/tests/Integration/PrivacyManagerConfigTest.php
@@ -31,15 +31,15 @@ public function setUp()
 
     public function test_useAnonymizedIpForVisitEnrichment()
     {
-        $this->assertTrue($this->config->useAnonymizedIpForVisitEnrichment);
-
-        $this->config->useAnonymizedIpForVisitEnrichment = false;
-
         $this->assertFalse($this->config->useAnonymizedIpForVisitEnrichment);
 
         $this->config->useAnonymizedIpForVisitEnrichment = true;
 
         $this->assertTrue($this->config->useAnonymizedIpForVisitEnrichment);
+
+        $this->config->useAnonymizedIpForVisitEnrichment = false;
+
+        $this->assertFalse($this->config->useAnonymizedIpForVisitEnrichment);
     }
 
     public function test_doNotTrackEnabled()
@@ -82,7 +82,7 @@ public function test_setTrackerCacheContent()
             'PrivacyManager.ipAddressMaskLength' => 2,
             'PrivacyManager.ipAnonymizerEnabled' => true,
             'PrivacyManager.doNotTrackEnabled'   => true,
-            'PrivacyManager.useAnonymizedIpForVisitEnrichment' => true,
+            'PrivacyManager.useAnonymizedIpForVisitEnrichment' => false,
         );
 
         $this->assertEquals($expected, $content);