Fixing build and removing some references to AnonymizeIP.

3 files changed, 3 insertions, 8 deletions

diff --git a/core/Plugin/Manager.php b/core/Plugin/Manager.php
index dec9921093..87eeaa0e4b 100644
--- a/core/Plugin/Manager.php
+++ b/core/Plugin/Manager.php
@@ -65,7 +65,6 @@ class Manager extends Singleton
     );
 
     protected $corePluginsDisabledByDefault = array(
-        'AnonymizeIP',
         'DBStats',
         'DevicesDetection',
         'ExampleCommand',
diff --git a/core/Tracker.php b/core/Tracker.php
index 7c94b535a8..aaaa3cd567 100644
--- a/core/Tracker.php
+++ b/core/Tracker.php
@@ -755,9 +755,8 @@ class Tracker
         if (Common::getRequestVar('forceIpAnonymization', false, null, $args) == 1) {
             self::updateTrackerConfig('ip_address_mask_length', 2);
 
-            $section = Config::getInstance()->Plugins_Tracker;
-            $section['Plugins_Tracker'][] = "AnonymizeIP";
-            Config::getInstance()->Plugins_Tracker = $section;
+            self::connectDatabaseIfNotConnected();
+            \Piwik\Plugins\PrivacyManager\IPAnonymizer::activate();
 
             $forceIpAnonymization = true;
         }
@@ -780,9 +779,6 @@ class Tracker
             self::setForceVisitorId($customVisitorId);
         }
         $pluginsDisabled = array('Provider');
-        if (!$forceIpAnonymization) {
-            $pluginsDisabled[] = 'AnonymizeIP';
-        }
 
         // Disable provider plugin, because it is so slow to do many reverse ip lookups
         self::setPluginsNotToLoad($pluginsDisabled);
diff --git a/core/Tracker/Visit.php b/core/Tracker/Visit.php
index 0277bfd632..9862a61bce 100644
--- a/core/Tracker/Visit.php
+++ b/core/Tracker/Visit.php
@@ -94,7 +94,7 @@ class Visit implements VisitInterface
          * Triggered after visits are tested for exclusion so plugins can modify the IP address
          * persisted with a visit.
          * 
-         * This event is primarily used by the **AnonymizeIP** plugin to anonymize IP addresses.
+         * This event is primarily used by the **PrivacyManager** plugin to anonymize IP addresses.
          * 
          * @param string &$ip The visitor's IP address.
          */