Merge pull request #41 from matomo-org/revert-40-revert-39-requiretoken

Revert "Revert "Custom IP should be only sent when token is specified, otherwise the request fails""
matomo-org · Dec 14, 2018 · 96d9daf · 96d9daf
2 parents 85f01cd + 0021ee1
commit 96d9daf
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/PiwikTracker.php b/PiwikTracker.php
@@ -1687,7 +1687,7 @@ protected function getRequest($idSite)
             (!empty($_GET['KEY']) ? '&KEY=' . @urlencode($_GET['KEY']) : '') .
 
             // Only allowed for Admin/Super User, token_auth required,
-            (!empty($this->ip) ? '&cip=' . $this->ip : '') .
+            ((!empty($this->ip) && !empty($this->token_auth)) ? '&cip=' . $this->ip : '') .
             (!empty($this->userId) ? '&uid=' . urlencode($this->userId) : '') .
             (!empty($this->forcedDatetime) ? '&cdt=' . urlencode($this->forcedDatetime) : '') .
             (!empty($this->forcedNewVisit) ? '&new_visit=1' : '') .