From 0115e94cfd255b53ca517d9e8628386a382a239b Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sat, 20 May 2006 13:20:38 +0000 Subject: - seperate queries and cached queries - display correct read/unread information while displaying active topics - fix for SELECT DISTINCT in mssql using sql_query_limit - fix for forum updating in ACP using mssql (and probably other dbal having problems with primary keys in updates) git-svn-id: file:///svn/phpbb/trunk@5940 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/db/oracle.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'phpBB/includes/db/oracle.php') diff --git a/phpBB/includes/db/oracle.php b/phpBB/includes/db/oracle.php index 72732d2a50..f2499c5456 100644 --- a/phpBB/includes/db/oracle.php +++ b/phpBB/includes/db/oracle.php @@ -99,11 +99,10 @@ class dbal_oracle extends dbal $this->last_query_text = $query; $this->query_result = ($cache_ttl && method_exists($cache, 'sql_load')) ? $cache->sql_load($query) : false; - + $this->sql_add_num_queries($this->query_result); + if (!$this->query_result) { - $this->num_queries++; - $in_transaction = false; if (!$this->transaction) { -- cgit v1.2.1