diff options
| author | mattab <matthieu.aubry@gmail.com> | 2015-04-30 01:20:56 +0300 |
|---|---|---|
| committer | mattab <matthieu.aubry@gmail.com> | 2015-04-30 01:20:56 +0300 |
| commit | 9b80858be40b520da05fb16fffe07c6b982d4a56 (patch) | |
| tree | b39927ecd09c246e1aec723ef02eabffddbafd71 /js | |
| parent | 873f559d22bcdfa396ba9bdc6ea6805b505111bb (diff) | |
| parent | f708e7081df49ae9a1fb9e5861d4283c262d264c (diff) | |
Merge branch 'master' into 7752
Conflicts:
piwik.js
Diffstat (limited to 'js')
| -rw-r--r-- | js/piwik.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/js/piwik.js b/js/piwik.js index 19c41aee68..280b84674c 100644 --- a/js/piwik.js +++ b/js/piwik.js @@ -2668,6 +2668,8 @@ if (typeof Piwik !== 'object') { if(visitorUUID.length) { uuid = visitorUUID; + } else if ('0' == hasCookies()){ + uuid = ''; } else { uuid = generateRandomUuid(); } |