firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

Merge pull request #215 from kkigomi/feature/sql_query_fix

Browse Source 
#212 PR에서 DB 커넥션 지정 오류 수정 & sql_query_after 이벤트에 누락된 $source 파라메터 추가
This commit is contained in:
thisgun
2023-01-09 16:00:52 +09:00
committed by GitHub
parent dbcb6a2cb6 3706ef99d3
commit 1cb12d9f2c
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/common.lib.php
View File

@ -1702,21 +1702,21 @@ function sql_query($sql, $error=G5_DISPLAY_SQL_ERROR, $link=null)
$end_time = ($is_debug || G5_COLLECT_QUERY) ? get_microtime() : 0;
$error = null;
$source = array();
if ($is_debug || G5_COLLECT_QUERY) {
if(function_exists('mysqli_error') && G5_MYSQLI_USE) {
$error = array(
'error_code' => mysqli_errno($g5['connect_db']),
'error_message' => mysqli_error($g5['connect_db']),
'error_code' => mysqli_errno($link),
'error_message' => mysqli_error($link),
);
} else {
$error = array(
'error_code' => mysql_errno($g5['connect_db']),
'error_message' => mysql_error($g5['connect_db']),
'error_code' => mysql_errno($link),
'error_message' => mysql_error($link),
);
}
$stack = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
$source = array();
$found = false;
foreach ($stack as $index => $trace) {
@ -1760,7 +1760,7 @@ function sql_query($sql, $error=G5_DISPLAY_SQL_ERROR, $link=null)
);
}
run_event('sql_query_after', $result, $sql, $start_time, $end_time, $error);
run_event('sql_query_after', $result, $sql, $start_time, $end_time, $error, $source);
return $result;
}