Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorThomas Steur <thomas.steur@gmail.com>2015-11-02 00:33:54 +0300
committerThomas Steur <thomas.steur@gmail.com>2015-11-02 00:33:54 +0300
commitebbf22ae265ba8c9a67bea1efd06fe26a96dd253 (patch)
tree8e08e65a30f42415e53a560c7a107928905979ac /js
parentda827372f3721461fab8cb8f524f8de84a268ddd (diff)
fixes #9130 use window.JSON only if it actually contains JSON API methods stringify and parse
Diffstat (limited to 'js')
-rw-r--r--js/piwik.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/piwik.js b/js/piwik.js
index b5608f1230..c082e34272 100644
--- a/js/piwik.js
+++ b/js/piwik.js
@@ -28,7 +28,7 @@
/*global JSON2:true */
-if (typeof JSON2 !== 'object' && window.JSON) {
+if (typeof JSON2 !== 'object' && typeof window.JSON === 'object' && window.JSON.stringify && window.JSON.parse) {
JSON2 = window.JSON;
} else {
(function () {