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
diff options
context:
space:
mode:
authorrobocoder <anthon.pang@gmail.com>2011-01-04 21:56:43 +0300
committerrobocoder <anthon.pang@gmail.com>2011-01-04 21:56:43 +0300
commit48da61efb03383cf7536e79523888d4f9255f26d (patch)
tree3f523c950fcc06dda682d45cb739a6269d2e132c /libs/upgradephp
parent6526e76781fa92b12d7655410148e82ebf375e6b (diff)
php 5.1.x - compatibility fix for nested arrays
git-svn-id: http://dev.piwik.org/svn/trunk@3618 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'libs/upgradephp')
-rw-r--r--libs/upgradephp/upgrade.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/upgradephp/upgrade.php b/libs/upgradephp/upgrade.php
index f04524994e..18e9bfd994 100644
--- a/libs/upgradephp/upgrade.php
+++ b/libs/upgradephp/upgrade.php
@@ -261,7 +261,7 @@ if (!function_exists("json_decode")) {
#-= in-object
elseif ($state==='}') {
list($i, $n) = json_decode($json, 0, $n, 0, ":"); // this allowed non-string indicies
- list($v, $n) = json_decode($json, 0, $n+1, 0, ",}");
+ list($v, $n) = json_decode($json, $assoc, $n+1, 0, ",}");
$val[$i] = $v;
if ($json[$n] == "}") { return array($val, $n); }
}