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:
authorMatthieu Aubry <matt@piwik.org>2015-04-01 04:36:37 +0300
committerMatthieu Aubry <matt@piwik.org>2015-04-01 04:36:37 +0300
commitf5ed4fdc56fb0096ba18a9832a3f9fd8d48ed8b4 (patch)
treebda59d65237ae07c0979175ab34eaab33114a5f6 /js
parentb9d4cfa107b319772d68008dbe172a2ad8e691dd (diff)
parentcc5f32a756b222cc944ddb639a5d141f6e23e165 (diff)
Merge pull request #7231 from shesek/patch-1
Use the native JSON when available
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 75f9c9dbeb..cca08b968a 100644
--- a/js/piwik.js
+++ b/js/piwik.js
@@ -45,7 +45,7 @@
// methods in a closure to avoid creating global variables.
if (typeof JSON2 !== 'object') {
- JSON2 = {};
+ JSON2 = window.JSON || {};
}
(function () {