mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-13 12:14:06 +02:00
Code Issues Releases Wiki Activity

Merge branch 'ticket/17232' into ticket/17232-master

Browse Source
This commit is contained in:
rxu
2023-12-20 15:39:26 +07:00
parent f9863f9b34 6a8140e82b
commit 83f9838217
6 changed files with 87 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
phpBB/phpbb/db/driver/mssqlnative.php
View File

@@ -136,12 +136,22 @@ class mssqlnative extends \phpbb\db\driver\mssql_base
if ($this->query_result === false)
{
if (($this->query_result = @sqlsrv_query($this->db_connect_id, $query, array(), $this->query_options)) === false)
try
{
$this->query_result = @sqlsrv_query($this->db_connect_id, $query, array(), $this->query_options);
}
catch (\Error $e)
{
// Do nothing as SQL driver will report the error
}
if ($this->query_result === false)
{
$this->sql_error($query);
}
// reset options for next query
$this->query_options = array();
// Reset options for the next query
$this->query_options = [];
if ($this->debug_sql_explain)
{