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:
authorStefan Giehl <stefan@matomo.org>2020-12-17 22:09:17 +0300
committerGitHub <noreply@github.com>2020-12-17 22:09:17 +0300
commit9790d90f876ae74b5770f23b1958384b01d2028c (patch)
treea812a55d0c18c8e671fbf88e08b0a10f79fd19fd /plugins/PrivacyManager/Controller.php
parent7edc2c9864f1b2fe43324f247ea82564d1112319 (diff)
Use correct tracker filename in privacy settings (#16970)
Diffstat (limited to 'plugins/PrivacyManager/Controller.php')
-rw-r--r--plugins/PrivacyManager/Controller.php9
1 files changed, 8 insertions, 1 deletions
diff --git a/plugins/PrivacyManager/Controller.php b/plugins/PrivacyManager/Controller.php
index 6de9e89e07..1c3521163b 100644
--- a/plugins/PrivacyManager/Controller.php
+++ b/plugins/PrivacyManager/Controller.php
@@ -19,6 +19,7 @@ use Piwik\Nonce;
use Piwik\Notification;
use Piwik\Option;
use Piwik\Piwik;
+use Piwik\Plugin\Manager;
use Piwik\Plugins\CustomJsTracker\File;
use Piwik\Plugins\LanguagesManager\LanguagesManager;
use Piwik\Scheduler\Scheduler;
@@ -187,8 +188,14 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
if (Piwik::hasUserSuperUserAccess()) {
$jsCodeGenerator = new TrackerCodeGenerator();
$file = new File(PIWIK_DOCUMENT_ROOT . '/' . $jsCodeGenerator->getJsTrackerEndpoint());
+ $filename = $jsCodeGenerator->getJsTrackerEndpoint();
- $view->trackerFileName = $jsCodeGenerator->getJsTrackerEndpoint();
+ if (Manager::getInstance()->isPluginActivated('CustomJsTracker')) {
+ $file = StaticContainer::get('Piwik\Plugins\CustomJsTracker\TrackerUpdater')->getToFile();
+ $filename = $file->getName();
+ }
+
+ $view->trackerFileName = $filename;
$view->trackerWritable = $file->hasWriteAccess();
$view->deleteData = $this->getDeleteDataInfo();
$view->anonymizeIP = $this->getAnonymizeIPInfo();