Merge branch '3.x-dev' into 4.x-dev

1 files changed, 13 insertions, 0 deletions

diff --git a/js/tracker.php b/js/tracker.php
index 8098163654..0e70c4c641 100644
--- a/js/tracker.php
+++ b/js/tracker.php
@@ -67,6 +67,19 @@ $environment = new \Piwik\Application\Environment(null, array(
 ));
 $environment->init();
 
+if (!\Piwik\Tracker\IgnoreCookie::isIgnoreCookieFound()) {
+    
+    $request = new \Piwik\Tracker\Request(array());
+    
+    if ($request->shouldUseThirdPartyCookie()) {
+        $visitorId = $request->getVisitorIdForThirdPartyCookie();
+        if (!$visitorId) {
+            $visitorId = \Piwik\Common::hex2bin(\Piwik\Tracker\Visit::generateUniqueVisitorId());
+        }
+        $request->setThirdPartyCookie($visitorId);
+    }
+}
+
 ProxyHttp::serverStaticFile($file, "application/javascript; charset=UTF-8", $daysExpireFarFuture, $byteStart, $byteEnd);
 
 exit;