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.

2 files changed, 6 insertions, 6 deletions

diff --git a/plugins/PrivacyManager/Config.php b/plugins/PrivacyManager/Config.php
index ac6e143b11..3767cdc5f4 100644
--- a/plugins/PrivacyManager/Config.php
+++ b/plugins/PrivacyManager/Config.php
@@ -27,7 +27,7 @@ use Piwik\Tracker\Cache;
 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
index 1e17f7253f..9c6b56a208 100644
--- a/plugins/PrivacyManager/tests/Integration/PrivacyManagerConfigTest.php
+++ b/plugins/PrivacyManager/tests/Integration/PrivacyManagerConfigTest.php
@@ -31,15 +31,15 @@ class PrivacyManagerConfigTest extends IntegrationTestCase
 
     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 @@ class PrivacyManagerConfigTest extends IntegrationTestCase
             'PrivacyManager.ipAddressMaskLength' => 2,
             'PrivacyManager.ipAnonymizerEnabled' => true,
             'PrivacyManager.doNotTrackEnabled'   => true,
-            'PrivacyManager.useAnonymizedIpForVisitEnrichment' => true,
+            'PrivacyManager.useAnonymizedIpForVisitEnrichment' => false,
         );
 
         $this->assertEquals($expected, $content);