Merge remote-tracking branch 'origin/master'

Conflicts:
	tests/PHPUnit/UI

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;