Fixing build and removing some references to AnonymizeIP.

core/Plugin/Manager.php

@@ -65,7 +65,6 @@ class Manager extends Singleton
     );
 
     protected $corePluginsDisabledByDefault = array(
-        'AnonymizeIP',
         'DBStats',
         'DevicesDetection',
         'ExampleCommand',

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);

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.
          */

CustomAlerts @ cc7e2a2e

-Subproject commit 78ae6de0ad1c3a638f70f9aedf52b362fed4b6e9
+Subproject commit cc7e2a2e6473b3f7efdc75d67fde88957a4124b4

VisitorGenerator @ f01efa32

-Subproject commit 700c71b483a661da6a5fef7f49070de85631a576
+Subproject commit f01efa321b1add9e25e1fa84ec79048913831aa3

tests/PHPUnit/Core/ReleaseCheckListTest.php

@@ -122,7 +122,6 @@ class ReleaseCheckListTest extends PHPUnit_Framework_TestCase
     public function testCheckThatGivenPluginsAreDisabledByDefault()
     {
         $pluginsShouldBeDisabled = array(
-            'AnonymizeIP',
             'DBStats'
         );
         foreach ($pluginsShouldBeDisabled as $pluginName) {

tests/PHPUnit/IntegrationTestCase.php

@@ -204,6 +204,9 @@ abstract class IntegrationTestCase extends PHPUnit_Framework_TestCase
         
         \Piwik\SettingsPiwik::$cachedKnownSegmentsToArchive = null;
         \Piwik\CacheFile::$invalidateOpCacheBeforeRead = true;
+
+        \Piwik\Plugins\PrivacyManager\IPAnonymizer::deactivate();
+        \Piwik\Plugins\PrivacyManager\DoNotTrackHeaderChecker::deactivate();
     }
 
     public static function tearDownAfterClass()