mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-04-21 06:47:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1093 from Alkarex/json_decode

Browse Source 
json_decode fallback debug
This commit is contained in:
Alexandre Alapetite
2016-02-25 19:27:05 +01:00
parent bc6a1eab88 bd47d14a53
commit b46c8607ee
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/lib_rss.php
View File

@@ -1,16 +1,16 @@
<?php
if (!function_exists('json_decode')) {
require_once('JSON.php');
function json_decode($var) {
$JSON = new Services_JSON;
return (array)($JSON->decode($var));
function json_decode($var, $assoc = false) {
$JSON = new Services_JSON($assoc ? SERVICES_JSON_LOOSE_TYPE : 0);
return $JSON->decode($var);
}
}
if (!function_exists('json_encode')) {
require_once('JSON.php');
function json_encode($var) {
$JSON = new Services_JSON;
$JSON = new Services_JSON();
return $JSON->encodeUnsafe($var);
}
}