diff options
Diffstat (limited to 'core/Plugin')
-rw-r--r-- | core/Plugin/Manager.php | 13 | ||||
-rw-r--r-- | core/Plugin/RequestProcessors.php | 3 | ||||
-rw-r--r-- | core/Plugin/Visualization.php | 13 |
3 files changed, 23 insertions, 6 deletions
diff --git a/core/Plugin/Manager.php b/core/Plugin/Manager.php index 150151ee3e..c3974937a0 100644 --- a/core/Plugin/Manager.php +++ b/core/Plugin/Manager.php @@ -1070,11 +1070,20 @@ class Manager if ($saveConfig) { PiwikConfig::getInstance()->forceSave(); + $this->clearCache($pluginName); } } public function isTrackerPlugin(Plugin $plugin) { + if (!$this->isPluginInstalled($plugin->getPluginName())) { + return false; + } + + if ($plugin->isTrackerPlugin()) { + return true; + } + $dimensions = VisitDimension::getDimensions($plugin); if (!empty($dimensions)) { return true; @@ -1101,10 +1110,6 @@ class Manager return true; } - if ($plugin->isTrackerPlugin()) { - return true; - } - return false; } diff --git a/core/Plugin/RequestProcessors.php b/core/Plugin/RequestProcessors.php index ef69eb59d5..827274485e 100644 --- a/core/Plugin/RequestProcessors.php +++ b/core/Plugin/RequestProcessors.php @@ -14,7 +14,8 @@ class RequestProcessors { public function getRequestProcessors() { - $processors = Manager::getInstance()->findMultipleComponents('Tracker', 'Piwik\\Tracker\\RequestProcessor'); + $manager = Manager::getInstance(); + $processors = $manager->findMultipleComponents('Tracker', 'Piwik\\Tracker\\RequestProcessor'); $instances = array(); foreach ($processors as $processor) { diff --git a/core/Plugin/Visualization.php b/core/Plugin/Visualization.php index 8a35a971b2..fcd8891280 100644 --- a/core/Plugin/Visualization.php +++ b/core/Plugin/Visualization.php @@ -272,7 +272,18 @@ class Visualization extends ViewDataTable $idSite = Common::getRequestVar('idSite', null, 'string', $request); $module = $this->requestConfig->getApiModuleToRequest(); $action = $this->requestConfig->getApiMethodToRequest(); - $metadata = ApiApi::getInstance()->getMetadata($idSite, $module, $action); + + $apiParameters = array(); + $idDimension = Common::getRequestVar('idDimension', 0, 'int'); + $idGoal = Common::getRequestVar('idGoal', 0, 'int'); + if ($idDimension > 0) { + $apiParameters['idDimension'] = $idDimension; + } + if ($idGoal > 0) { + $apiParameters['idGoal'] = $idGoal; + } + + $metadata = ApiApi::getInstance()->getMetadata($idSite, $module, $action, $apiParameters); if (!empty($metadata)) { return array_shift($metadata); |