gnh1201/reasonableframework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update json.format.php

Browse Source
This commit is contained in:
Namhyeon Go 2020-01-14 11:28:39 +09:00 committed by GitHub
parent fc9459f814
commit 6713e2f654
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
helper/json.format.php
View File

@ -25,7 +25,10 @@ if(!check_function_exists("json_encode_ex")) {
function json_encode_ex($data, $options=array()) { function json_encode_ex($data, $options=array()) {
$result = false; $result = false;
if(array_key_equals("adaptive", $options, true)) { $is_adaptive = array_key_equals("adaptive", $options, true);
$is_assoc = array_key_equals("assoc", $options, true);
if($is_adaptive) {
// 2018-06-01: Adaptive JSON is always quotes without escape non-ascii characters // 2018-06-01: Adaptive JSON is always quotes without escape non-ascii characters
$lines = array(); $lines = array();
foreach($data as $k=>$v) { foreach($data as $k=>$v) {
@ -36,6 +39,8 @@ if(!check_function_exists("json_encode_ex")) {
} }
} }
$result = "{" . implode(",", $lines) . "}"; $result = "{" . implode(",", $lines) . "}";
} elseif($is_assoc) {
$result = json_encode($data, true);
} else { } else {
$result = json_encode($data); $result = json_encode($data);
} }