Merged 3.x-dev

InfinityVoid · Mar 22, 2018 · 51addf1 · 51addf1
1 parent 198f05e
commit 51addf1
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 15 deletions.
diff --git a/js/piwik.js b/js/piwik.js
@@ -7141,7 +7141,9 @@ if (typeof window.Piwik !== 'object') {
                             apply(paq[iterator]);
                             delete paq[iterator];
 
-                            if (appliedMethods[methodName] > 1) {
+                            var isMethodCallableMultipleTimes = ["addTracker"];
+                            if (appliedMethods[methodName] > 1
+                                && isMethodCallableMultipleTimes.indexOf(methodName) !== -1) {
                                 logConsoleError('The method ' + methodName + ' is registered more than once in "_paq" variable. Only the last call has an effect. Please have a look at the multiple Piwik trackers documentation: https://developer.piwik.org/guides/tracking-javascript-guide#multiple-piwik-trackers');
                             }
 

diff --git a/js/piwik.min.js b/js/piwik.min.js