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
path: root/core
diff options
context:
space:
mode:
authorThomas Steur <tsteur@users.noreply.github.com>2018-11-29 22:10:21 +0300
committerGitHub <noreply@github.com>2018-11-29 22:10:21 +0300
commit1d3388c1cd3dd03743576d670118a65e9cd879cb (patch)
tree9eaecc6e25c5b854e73701d4a8824fd9cde43d8c /core
parentd4b86bb164d037f0a15e7d985a5f8072065b7eaa (diff)
Do not specify a category delimiter by default (#13688)
* do not specify a category delimiter by default * couple fixes * more fixes * fix more tests * fix more testts * Update LabelFilterTest.php * Update ArchivingHelper.php * fix test
Diffstat (limited to 'core')
-rw-r--r--core/Tracker/ActionPageview.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/core/Tracker/ActionPageview.php b/core/Tracker/ActionPageview.php
index 79f8f46724..6b48b54fa1 100644
--- a/core/Tracker/ActionPageview.php
+++ b/core/Tracker/ActionPageview.php
@@ -66,6 +66,10 @@ class ActionPageview extends Action
// get the delimiter, by default '/'; BC, we read the old action_category_delimiter first (see #1067)
$actionCategoryDelimiter = $this->getActionCategoryDelimiter();
+ if ($actionCategoryDelimiter === '') {
+ return $actionName;
+ }
+
// create an array of the categories delimited by the delimiter
$split = explode($actionCategoryDelimiter, $actionName);
$split = $this->trimEveryCategory($split);
@@ -95,6 +99,6 @@ class ActionPageview extends Action
return Config::getInstance()->General['action_category_delimiter'];
}
- return Config::getInstance()->General['action_url_category_delimiter'];
+ return Config::getInstance()->General['action_title_category_delimiter'];
}
}