diff options
| author | Matthieu Napoli <matthieu@mnapoli.fr> | 2014-11-14 06:45:35 +0300 |
|---|---|---|
| committer | Matthieu Napoli <matthieu@mnapoli.fr> | 2014-11-14 06:45:35 +0300 |
| commit | a91388d2b1b3c60733ce19f35a4675a1ba6467df (patch) | |
| tree | 77256a0a24b6085541d73ba19f277fe88a7d0866 /core | |
| parent | c7295c121b94489edf2800c6b220ee86e7b4c496 (diff) | |
Replaced usage of deprecated Common::json_encode to json_encode
Diffstat (limited to 'core')
| -rw-r--r-- | core/Common.php | 2 | ||||
| -rw-r--r-- | core/Plugin/MetadataLoader.php | 2 | ||||
| -rw-r--r-- | core/Tracker.php | 4 | ||||
| -rw-r--r-- | core/Translate.php | 2 | ||||
| -rw-r--r-- | core/Updates/1.8.3-b1.php | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/core/Common.php b/core/Common.php index 823e884af1..a3e7515a24 100644 --- a/core/Common.php +++ b/core/Common.php @@ -462,7 +462,7 @@ class Common // we deal w/ json differently if ($varType == 'json') { $value = self::undoMagicQuotes($requestArrayToUse[$varName]); - $value = self::json_decode($value, $assoc = true); + $value = json_decode($value, $assoc = true); return self::sanitizeInputValues($value, $alreadyStripslashed = true); } diff --git a/core/Plugin/MetadataLoader.php b/core/Plugin/MetadataLoader.php index 34bb90dcdc..e75bc58338 100644 --- a/core/Plugin/MetadataLoader.php +++ b/core/Plugin/MetadataLoader.php @@ -95,7 +95,7 @@ class MetadataLoader return array(); } - $info = Common::json_decode($json, $assoc = true); + $info = json_decode($json, $assoc = true); if (!is_array($info) || empty($info) ) { diff --git a/core/Tracker.php b/core/Tracker.php index 38467fc65d..a84afd9632 100644 --- a/core/Tracker.php +++ b/core/Tracker.php @@ -436,7 +436,7 @@ class Tracker $result['message'] = $this->getMessageFromException($e); } Common::sendHeader('Content-Type: application/json'); - echo Common::json_encode($result); + echo json_encode($result); die(1); exit; } @@ -496,7 +496,7 @@ class Tracker $this->outputAccessControlHeaders(); Common::sendHeader('Content-Type: application/json'); - echo Common::json_encode($result); + echo json_encode($result); exit; } switch ($this->getState()) { diff --git a/core/Translate.php b/core/Translate.php index 65381c0a2d..c29d0f0339 100644 --- a/core/Translate.php +++ b/core/Translate.php @@ -173,7 +173,7 @@ class Translate $clientSideTranslations[$key] = $translations[$plugin][$stringName]; } - $js = 'var translations = ' . Common::json_encode($clientSideTranslations) . ';'; + $js = 'var translations = ' . json_encode($clientSideTranslations) . ';'; $js .= "\n" . 'if (typeof(piwik_translations) == \'undefined\') { var piwik_translations = new Object; }' . 'for(var i in translations) { piwik_translations[i] = translations[i];} '; return $js; diff --git a/core/Updates/1.8.3-b1.php b/core/Updates/1.8.3-b1.php index 7a00ec20b3..ee8e6c4d00 100644 --- a/core/Updates/1.8.3-b1.php +++ b/core/Updates/1.8.3-b1.php @@ -98,8 +98,8 @@ class Updates_1_8_3_b1 extends Updates is_null($period) ? ScheduledReports::DEFAULT_PERIOD : $period, ScheduledReports::EMAIL_TYPE, is_null($format) ? ScheduledReports::DEFAULT_REPORT_FORMAT : $format, - Common::json_encode(preg_split('/,/', $reports)), - Common::json_encode($parameters), + json_encode(preg_split('/,/', $reports)), + json_encode($parameters), $ts_created, $ts_last_sent, $deleted |