Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordiosmosis <diosmosis@users.noreply.github.com>2018-12-14 04:30:23 +0300
committerGitHub <noreply@github.com>2018-12-14 04:30:23 +0300
commit67f4ec5704efb3242218527b906b1082e3e1f5e8 (patch)
tree38f8610fbac5c7863be9af661fd0f2411ebddba5 /plugins/UserCountry
parentef323275e351ab26370ba67aa5ca62b85035cb45 (diff)
Revert "Always fail during tracking when authentication is required b… (#13858)
* Revert "Always fail during tracking when authentication is required but invalid token is used (#13675)" This reverts commit 2862316a05301755681305fbe060591c08d8c265. * remove tests moved to integration test
Diffstat (limited to 'plugins/UserCountry')
-rw-r--r--plugins/UserCountry/Columns/Base.php11
1 files changed, 4 insertions, 7 deletions
diff --git a/plugins/UserCountry/Columns/Base.php b/plugins/UserCountry/Columns/Base.php
index aef08320fe..d599043aba 100644
--- a/plugins/UserCountry/Columns/Base.php
+++ b/plugins/UserCountry/Columns/Base.php
@@ -9,7 +9,6 @@
namespace Piwik\Plugins\UserCountry\Columns;
use Piwik\Common;
-use Piwik\Exception\InvalidRequestParameterException;
use Piwik\Network\IPUtils;
use Piwik\Plugin\Dimension\VisitDimension;
use Piwik\Plugins\UserCountry\VisitorGeolocator;
@@ -28,14 +27,12 @@ abstract class Base extends VisitDimension
protected function getUrlOverrideValueIfAllowed($urlParamToOverride, Request $request)
{
- $value = Common::getRequestVar($urlParamToOverride, false, 'string', $request->getParams());
+ if (!$request->isAuthenticated()) {
+ return false;
+ }
+ $value = Common::getRequestVar($urlParamToOverride, false, 'string', $request->getParams());
if (!empty($value)) {
- if (!$request->isAuthenticated()) {
- Common::printDebug("WARN: Tracker API '$urlParamToOverride' was used with invalid token_auth");
- throw new InvalidRequestParameterException("Tracker API '$urlParamToOverride' was used, requires valid token_auth");
- }
-
return $value;
}