aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2003-08-12 16:03:29 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2003-08-12 16:03:29 +0000
commite6978f1e1c1bbf89a985ee48fa7a6b9b33ba9dfd (patch)
treefb1d02390d41d031fdc64ecd8e640f2590039d37
parent567ff01df1d1b592f7c24afd68a08cafe1cd3712 (diff)
downloadforums-e6978f1e1c1bbf89a985ee48fa7a6b9b33ba9dfd.tar
forums-e6978f1e1c1bbf89a985ee48fa7a6b9b33ba9dfd.tar.gz
forums-e6978f1e1c1bbf89a985ee48fa7a6b9b33ba9dfd.tar.bz2
forums-e6978f1e1c1bbf89a985ee48fa7a6b9b33ba9dfd.tar.xz
forums-e6978f1e1c1bbf89a985ee48fa7a6b9b33ba9dfd.zip
Setting returned query_id to correct value
git-svn-id: file:///svn/phpbb/trunk@4390 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/includes/db/mysql.php15
1 files changed, 8 insertions, 7 deletions
diff --git a/phpBB/includes/db/mysql.php b/phpBB/includes/db/mysql.php
index f7067adf4f..395809e6fa 100644
--- a/phpBB/includes/db/mysql.php
+++ b/phpBB/includes/db/mysql.php
@@ -119,11 +119,12 @@ class sql_db
if ($query != '')
{
global $cache;
+
+ $this->query_result = false;
- $this->query_result = false;
if ($max_age && method_exists($cache, 'sql_load'))
{
- $this->query_result = $cache->sql_load($query, $max_age);
+ $cache->sql_load($query, $max_age);
}
if (!$this->query_result)
@@ -192,12 +193,12 @@ class sql_db
{
$this->open_queries[] = $this->query_result;
}
- }
- if ($max_age && method_exists($cache, 'sql_save'))
- {
- $cache->sql_save($query, $this->query_result);
- @mysql_free_result(array_pop($this->open_queries));
+ if ($max_age && method_exists($cache, 'sql_save'))
+ {
+ $cache->sql_save($query, $this->query_result);
+ @mysql_free_result(array_pop($this->open_queries));
+ }
}
}
else