Merge remote-tracking branch 'origin/master' into 4996_content_tracking

Conflicts:
	core/Metrics.php
	js/piwik.js
	piwik.js
	tests/javascript/index.php

1 files changed, 0 insertions, 19 deletions

diff --git a/core/Tracker.php b/core/Tracker.php
index ef9c7d7e4f..d9e8a04278 100644
--- a/core/Tracker.php
+++ b/core/Tracker.php
@@ -45,7 +45,6 @@ class Tracker
 
     protected static $forcedDateTime = null;
     protected static $forcedIpString = null;
-    protected static $forcedVisitorId = null;
 
     protected static $pluginsNotToLoad = array();
     protected static $pluginsToLoad = array();
@@ -92,7 +91,6 @@ class Tracker
     {
         self::$forcedIpString = null;
         self::$forcedDateTime = null;
-        self::$forcedVisitorId = null;
         $this->stateValid = self::STATE_NOTHING_TO_NOTICE;
     }
 
@@ -106,11 +104,6 @@ class Tracker
         self::$forcedDateTime = $dateTime;
     }
 
-    public static function setForceVisitorId($visitorId)
-    {
-        self::$forcedVisitorId = $visitorId;
-    }
-
     /**
      * Do not load the specified plugins (used during testing, to disable Provider plugin)
      * @param array $plugins
@@ -770,12 +763,6 @@ class Tracker
         if (!empty($customDatetime)) {
             $this->setForceDateTime($customDatetime);
         }
-
-        // Forced Visitor ID to record the visit / action
-        $customVisitorId = $request->getParam('cid');
-        if (!empty($customVisitorId)) {
-            $this->setForceVisitorId($customVisitorId);
-        }
     }
 
     public static function setTestEnvironment($args = null, $requestMethod = null)
@@ -835,11 +822,6 @@ class Tracker
             self::setForceDateTime($customDatetime);
         }
 
-        // Custom visitor id
-        $customVisitorId = Common::getRequestVar('cid', false, null, $args);
-        if (!empty($customVisitorId)) {
-            self::setForceVisitorId($customVisitorId);
-        }
         $pluginsDisabled = array('Provider');
 
         // Disable provider plugin, because it is so slow to do many reverse ip lookups
@@ -882,7 +864,6 @@ class Tracker
 
         try {
             if ($this->isVisitValid()) {
-                $request->setForcedVisitorId(self::$forcedVisitorId);
                 $request->setForceDateTime(self::$forcedDateTime);
                 $request->setForceIp(self::$forcedIpString);