diff options
author | mattab <matthieu.aubry@gmail.com> | 2014-04-07 05:36:51 +0400 |
---|---|---|
committer | mattab <matthieu.aubry@gmail.com> | 2014-04-07 05:36:51 +0400 |
commit | efb2fc667c65d22a07ed82e880c48ee58e2c0c62 (patch) | |
tree | 63d36779f8b604e3f1878ffc0b621ff0f80922c9 /core | |
parent | 1790f8a15efa15307b2b24843eb1276ec8767c14 (diff) | |
parent | 44aade37e9f6fcdc72549334b2eb2515a800cb73 (diff) |
Merge remote-tracking branch 'origin/master'
Conflicts:
tests/PHPUnit/UI
Diffstat (limited to 'core')
-rw-r--r-- | core/Piwik.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/Piwik.php b/core/Piwik.php index 1e93ff22dc..3117ecd508 100644 --- a/core/Piwik.php +++ b/core/Piwik.php @@ -151,15 +151,16 @@ class Piwik if ($mergeSubdomains || $mergeAliasUrls) { $options .= self::getJavascriptTagOptions($idSite, $mergeSubdomains, $mergeAliasUrls); } + $maxCustomVars = Plugins\CustomVariables\CustomVariables::getMaxCustomVariables(); if ($visitorCustomVariables) { - $options .= ' // you can set up to 5 custom variables for each visitor' . PHP_EOL; + $options .= ' // you can set up to ' . $maxCustomVars . ' custom variables for each visitor' . PHP_EOL; $index = 0; foreach ($visitorCustomVariables as $visitorCustomVariable) { $options .= ' _paq.push(["setCustomVariable", '.$index++.', "'.$visitorCustomVariable[0].'", "'.$visitorCustomVariable[1].'", "visit"]);' . PHP_EOL; } } if ($pageCustomVariables) { - $options .= ' // you can set up to 5 custom variables for each action (page view, download, click, site search)' . PHP_EOL; + $options .= ' // you can set up to ' . $maxCustomVars . ' custom variables for each action (page view, download, click, site search)' . PHP_EOL; $index = 0; foreach ($pageCustomVariables as $pageCustomVariable) { $options .= ' _paq.push(["setCustomVariable", '.$index++.', "'.$pageCustomVariable[0].'", "'.$pageCustomVariable[1].'", "page"]);' . PHP_EOL; |