diff options
Diffstat (limited to 'plugins/Transitions')
| -rw-r--r-- | plugins/Transitions/API.php | 7 | ||||
| -rw-r--r-- | plugins/Transitions/Transitions.php | 9 |
2 files changed, 11 insertions, 5 deletions
diff --git a/plugins/Transitions/API.php b/plugins/Transitions/API.php index bb855bdb4c..c9bd0af82a 100644 --- a/plugins/Transitions/API.php +++ b/plugins/Transitions/API.php @@ -108,14 +108,17 @@ class Piwik_Transitions_API private function deriveIdAction($actionName, $actionType) { $actionsPlugin = new Piwik_Actions; - + $actionName = Piwik_Common::unsanitizeInputValue($actionName); switch ($actionType) { case 'url': - $actionName = Piwik_Common::unsanitizeInputValue($actionName); return $actionsPlugin->getIdActionFromSegment($actionName, 'idaction_url'); case 'title': + // Transitions is called with Page titles separated by > so we transform back + $actionName = explode(Piwik_API_DataTableManipulator_LabelFilter::SEPARATOR_RECURSIVE_LABEL, $actionName); + $actionName = array_map('trim', $actionName ); + $actionName = implode("/", $actionName); $id = $actionsPlugin->getIdActionFromSegment($actionName, 'idaction_name'); if ($id < 0) diff --git a/plugins/Transitions/Transitions.php b/plugins/Transitions/Transitions.php index f51fbd0139..593b67fc7b 100644 --- a/plugins/Transitions/Transitions.php +++ b/plugins/Transitions/Transitions.php @@ -210,7 +210,8 @@ class Piwik_Transitions extends Piwik_Plugin ); } - private function getPageLabel(&$pageRecord, $isTitle) { + private function getPageLabel(&$pageRecord, $isTitle) + { if ($isTitle) { $label = $pageRecord['name']; @@ -330,11 +331,13 @@ class Piwik_Transitions extends Piwik_Plugin * Get the sum of all transitions to following actions (pages, outlinks, downloads). * Only works if queryFollowingActions() has been used directly before. */ - public function getTotalTransitionsToFollowingActions() { + public function getTotalTransitionsToFollowingActions() + { return $this->totalTransitionsToFollowingActions; } - private function getColumnTypeSuffix($actionType) { + private function getColumnTypeSuffix($actionType) + { if ($actionType == 'title') { return 'name'; } |