aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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