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

Update database.php

Browse Source
This commit is contained in:
Namhyeon Go 2019-10-13 00:24:56 +09:00 committed by GitHub
parent 997131e327
commit 60726530f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
system/database.php
View File

@ -671,26 +671,6 @@ if(!check_function_exists("get_timediff_on_query")) {
}
}
// get assoc from json raw data
if(!check_function_exists("json_decode_to_assoc")) {
function json_decode_to_assoc($data) {
$result = array();
$invalid_fn = array(
"NO_FUNCTION_JSON_DECODE" => "json_decode",
"NO_FUNCTION_JSON_LAST_ERROR" => "json_last_error",
);
$error = check_invaild_function($invalid_fn);
if($error < 0) {
$obj = @json_decode($data, true);
$result = (@json_last_error() === 0) ? $obj : $result;
}
return $result;
}
}
// temporary table
if(!check_function_exists("exec_db_temp_start")) {
function exec_db_temp_start($sql, $bind=array(), $options=array()) {
@ -717,5 +697,14 @@ if(!check_function_exists("close_db_connect")) {
}
}
// get assoc from json raw data
if(!check_function_exists("json_decode_to_assoc")) {
function json_decode_to_assoc($data) {
if(loadHelper("json.format")) {
return json_decode_ex($data, array("assoc" => true));
}
}
}
// set scope dbc
set_scope("dbc", get_db_connect());