mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-18 22:41:28 +02:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
rxu
2023-06-08 10:20:24 +07:00
parent 442430002c 1eb81e9b2a
commit 3e37770b61
12 changed files with 123 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
phpBB/phpbb/db/driver/mssql_odbc.php
View File

@@ -180,14 +180,16 @@ class mssql_odbc extends \phpbb\db\driver\mssql_base
return false;
}
$safe_query_id = $this->clean_query_id($this->query_result);
if ($cache && $cache_ttl)
{
$this->open_queries[(int) $this->query_result] = $this->query_result;
$this->open_queries[$safe_query_id] = $this->query_result;
$this->query_result = $cache->sql_save($this, $query, $this->query_result, $cache_ttl);
}
else if (strpos($query, 'SELECT') === 0)
{
$this->open_queries[(int) $this->query_result] = $this->query_result;
$this->open_queries[$safe_query_id] = $this->query_result;
}
}
else if ($this->debug_sql_explain)
@@ -255,9 +257,10 @@ class mssql_odbc extends \phpbb\db\driver\mssql_base
$query_id = $this->query_result;
}
if ($cache && $cache->sql_exists($query_id))
$safe_query_id = $this->clean_query_id($query_id);
if ($cache && $cache->sql_exists($safe_query_id))
{
return $cache->sql_fetchrow($query_id);
return $cache->sql_fetchrow($safe_query_id);
}
return ($query_id) ? odbc_fetch_array($query_id) : false;
@@ -296,13 +299,14 @@ class mssql_odbc extends \phpbb\db\driver\mssql_base
$query_id = $this->query_result;
}
if ($cache && !is_object($query_id) && $cache->sql_exists($query_id))
$safe_query_id = $this->clean_query_id($query_id);
if ($cache && $cache->sql_exists($safe_query_id))
{
$cache->sql_freeresult($query_id);
$cache->sql_freeresult($safe_query_id);
}
else if (isset($this->open_queries[(int) $query_id]))
else if (isset($this->open_queries[$safe_query_id]))
{
unset($this->open_queries[(int) $query_id]);
unset($this->open_queries[$safe_query_id]);
odbc_free_result($query_id);
}
}