mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-30 21:40:43 +02:00
Merge branch 'ticket/17232' into ticket/17232-master
This commit is contained in:
@@ -161,7 +161,16 @@ class mssql_odbc extends \phpbb\db\driver\mssql_base
|
||||
|
||||
if ($this->query_result === false)
|
||||
{
|
||||
if (($this->query_result = @odbc_exec($this->db_connect_id, $query)) === false)
|
||||
try
|
||||
{
|
||||
$this->query_result = @odbc_exec($this->db_connect_id, $query);
|
||||
}
|
||||
catch (\Error $e)
|
||||
{
|
||||
// Do nothing as SQL driver will report the error
|
||||
}
|
||||
|
||||
if ($this->query_result === false)
|
||||
{
|
||||
$this->sql_error($query);
|
||||
}
|
||||
|
Reference in New Issue
Block a user