mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-12 14:28:56 +00:00
LEAVE
git-svn-id: file:///svn/phpbb/trunk@7985 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
6aaf8d1ad7
commit
03efc190e9
1 changed files with 6 additions and 13 deletions
|
@ -1547,19 +1547,12 @@ function _sql($sql, &$errored, &$error_ary, $echo_dot = true)
|
||||||
|
|
||||||
$db->sql_return_on_error(true);
|
$db->sql_return_on_error(true);
|
||||||
|
|
||||||
if (preg_match('/^\\s*SELECT/', $sql))
|
$result = $db->sql_query($sql);
|
||||||
|
if ($db->sql_error_triggered)
|
||||||
{
|
{
|
||||||
$result = $db->sql_query($sql);
|
$errored = true;
|
||||||
if ($db->sql_error_triggered)
|
$error_ary['sql'][] = $db->sql_error_sql;
|
||||||
{
|
$error_ary['error_code'][] = $db->_sql_error();
|
||||||
$errored = true;
|
|
||||||
$error_ary['sql'][] = $db->sql_error_sql;
|
|
||||||
$error_ary['error_code'][] = $db->_sql_error();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
var_dump($sql);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$db->sql_return_on_error(false);
|
$db->sql_return_on_error(false);
|
||||||
|
@ -1569,7 +1562,7 @@ function _sql($sql, &$errored, &$error_ary, $echo_dot = true)
|
||||||
echo ". \n";
|
echo ". \n";
|
||||||
flush();
|
flush();
|
||||||
}
|
}
|
||||||
if (preg_match('/^\\s*SELECT/', $sql))
|
|
||||||
return $result;
|
return $result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue