diff --git a/htdocs/core/ajax/selectsearchbox.php b/htdocs/core/ajax/selectsearchbox.php index c7a1c7f6d30061fdc7ba178f167cfadeb87af0d5..1783c4794b5eb632c94c7150496684cfbaaf0075 100644 --- a/htdocs/core/ajax/selectsearchbox.php +++ b/htdocs/core/ajax/selectsearchbox.php @@ -43,6 +43,6 @@ if ($conf->projet->enabled) { $arrayresult['searchintoproject']=$langs->trans("SearchIntoProject", $search_boxvalue); } -print dol_json_encode($arrayresult); +print json_encode($arrayresult); if (is_object($db)) $db->close(); diff --git a/htdocs/core/lib/json.lib.php b/htdocs/core/lib/json.lib.php index 5a87e2537586c359f03b6e5c0bf4cba8923afcd8..6b868663aa703aafa1b3dd282a2650102e5e8dab 100644 --- a/htdocs/core/lib/json.lib.php +++ b/htdocs/core/lib/json.lib.php @@ -43,9 +43,12 @@ if (! function_exists('json_encode')) * @param mixed $elements PHP Object to json encode * @return string Json encoded string * @deprecated PHP >= 5.3 supports native json_encode + * @see json_encode() */ function dol_json_encode($elements) { + dol_syslog('dol_json_encode() is deprecated. Please update your code to use native json_encode().', LOG_WARNING); + $num=count($elements); if (is_object($elements)) // Count number of properties for an object { @@ -221,9 +224,12 @@ if (! function_exists('json_decode')) * @param bool $assoc False return an object, true return an array. Try to always use it with true ! * @return mixed Object or Array or false on error * @deprecated PHP >= 5.3 supports native json_decode + * @see json_decode() */ function dol_json_decode($json, $assoc=false) { + dol_syslog('dol_json_decode() is deprecated. Please update your code to use native json_decode().', LOG_WARNING); + $comment = false; $out=''; diff --git a/htdocs/projet/class/projectstats.class.php b/htdocs/projet/class/projectstats.class.php index 98e9c0ce3e0429ab2444feaff38b94ce1f7bd4d5..0578e3b95deb7fc99af47bf3cc9922ca4e6567f1 100644 --- a/htdocs/projet/class/projectstats.class.php +++ b/htdocs/projet/class/projectstats.class.php @@ -371,7 +371,7 @@ class ProjectStats extends Stats if ($foundintocache) // Cache file found and is not too old { dol_syslog(get_class($this) . '::' . __FUNCTION__ . " read data from cache file " . $newpathofdestfile . " " . $filedate . "."); - $data = dol_json_decode(file_get_contents($newpathofdestfile), true); + $data = json_decode(file_get_contents($newpathofdestfile), true); } else { $year = $startyear; while ( $year <= $endyear ) { @@ -397,7 +397,7 @@ class ProjectStats extends Stats if (! dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp); $fp = fopen($newpathofdestfile, 'w'); - fwrite($fp, dol_json_encode($data)); + fwrite($fp, json_encode($data)); fclose($fp); if (! empty($conf->global->MAIN_UMASK)) $newmask = $conf->global->MAIN_UMASK; @@ -460,4 +460,4 @@ class ProjectStats extends Stats // var_dump($res);print '<br>'; return $res; } -} \ No newline at end of file +}