diff options
| author | mattab <matthieu.aubry@gmail.com> | 2014-04-02 06:26:57 +0400 |
|---|---|---|
| committer | mattab <matthieu.aubry@gmail.com> | 2014-04-02 06:26:57 +0400 |
| commit | 6f9b869bae319cee8c0307fcc8a6446b333173be (patch) | |
| tree | 007b519ff3424cb0bf800fd91c625305e36f84cf /js | |
| parent | 20a1ff494e2867bdd36274a70a3bf94bdf5690fe (diff) | |
Fixes #4938 make sure we deal with undefined parameters
Should make the JavascriptTests build green again
Diffstat (limited to 'js')
| -rw-r--r-- | js/piwik.js | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/js/piwik.js b/js/piwik.js index ef966f1593..193b3f612b 100644 --- a/js/piwik.js +++ b/js/piwik.js @@ -2476,15 +2476,21 @@ if (typeof Piwik !== 'object') { if (!isDefined(scope)) { scope = 'visit'; } - + if (!isDefined(name)) { + return; + } + if (!isDefined(value)) { + value = ""; + } if (index > 0) { - name = isDefined(name) && !isString(name) ? String(name) : name; - value = isDefined(value) && !isString(value) ? String(value) : value; + name = !isString(name) ? String(name) : name; + value = !isString(value) ? String(value) : value; toRecord = [name.slice(0, customVariableMaximumLength), value.slice(0, customVariableMaximumLength)]; - if (scope === 'visit' || scope === 2) { /* GA compatibility/misuse */ + // numeric scope is there for GA compatibility + if (scope === 'visit' || scope === 2) { loadCustomVariables(); customVariables[index] = toRecord; - } else if (scope === 'page' || scope === 3) { /* GA compatibility/misuse */ + } else if (scope === 'page' || scope === 3) { customVariablesPage[index] = toRecord; } else if (scope === 'event') { /* GA does not have 'event' scope but we do */ customVariablesEvent[index] = toRecord; @@ -2708,6 +2714,7 @@ if (typeof Piwik !== 'object') { /** * Set visitor cookie timeout (in seconds) + * Defaults to 2 years (timeout=63072000000) * * @param int timeout */ @@ -2716,7 +2723,8 @@ if (typeof Piwik !== 'object') { }, /** - * Set session cookie timeout (in seconds) + * Set session cookie timeout (in seconds). + * Defaults to 30 minutes (timeout=1800000) * * @param int timeout */ @@ -2725,7 +2733,8 @@ if (typeof Piwik !== 'object') { }, /** - * Set referral cookie timeout (in seconds) + * Set referral cookie timeout (in seconds). + * Defaults to 6 months (15768000000) * * @param int timeout */ @@ -3133,7 +3142,7 @@ if (typeof Piwik !== 'object') { /************************************************************ * Deprecated functionality below - * - for legacy piwik.js compatibility + * Legacy piwik.js compatibility ftw ************************************************************/ /* |