From 03d1687c49860afbf7aa056d983c442d5f0203b5 Mon Sep 17 00:00:00 2001
From: Thomas Steur <thomas.steur@googlemail.com>
Date: Fri, 14 Nov 2014 01:14:35 +0100
Subject: [PATCH] refs #6661 also return HTTP 400 when idsite is 0
---
core/Tracker/Request.php | 3 ++-
tests/PHPUnit/System/TrackerTest.php | 8 ++++++++
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/core/Tracker/Request.php b/core/Tracker/Request.php
index b733ae30ea..110d0eb65d 100644
--- a/core/Tracker/Request.php
+++ b/core/Tracker/Request.php
@@ -12,6 +12,7 @@ use Exception;
use Piwik\Common;
use Piwik\Config;
use Piwik\Cookie;
+use Piwik\Exception\UnexpectedWebsiteFoundException;
use Piwik\IP;
use Piwik\Network\IPUtils;
use Piwik\Piwik;
@@ -390,7 +391,7 @@ class Request
Piwik::postEvent('Tracker.Request.getIdSite', array(&$idSite, $this->params));
if ($idSite <= 0) {
- throw new Exception('Invalid idSite: \'' . $idSite . '\'');
+ throw new UnexpectedWebsiteFoundException('Invalid idSite: \'' . $idSite . '\'');
}
return $idSite;
diff --git a/tests/PHPUnit/System/TrackerTest.php b/tests/PHPUnit/System/TrackerTest.php
index 29ba0c95e5..baba28e763 100755
--- a/tests/PHPUnit/System/TrackerTest.php
+++ b/tests/PHPUnit/System/TrackerTest.php
@@ -77,4 +77,12 @@ class TrackerTest extends SystemTestCase
$this->assertResponseCode(400, $url);
}
+ public function test_response_ShouldSend400ResponseCode_IfSiteIdIsZero()
+ {
+ $url = $this->tracker->getUrlTrackPageView('Test');
+ $url .= '&idsite=0';
+
+ $this->assertResponseCode(400, $url);
+ }
+
}
--
GitLab