aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2003-08-12 23:40:14 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2003-08-12 23:40:14 +0000
commit1e91f9b5542dd69caf60562566b5254365fd9e6f (patch)
tree861d34ce10b4b8a4552630c972d1e4d722ff9b0a /phpBB
parent1d8f0dba0744888949a291550b0dc4e1af335ee0 (diff)
downloadforums-1e91f9b5542dd69caf60562566b5254365fd9e6f.tar
forums-1e91f9b5542dd69caf60562566b5254365fd9e6f.tar.gz
forums-1e91f9b5542dd69caf60562566b5254365fd9e6f.tar.bz2
forums-1e91f9b5542dd69caf60562566b5254365fd9e6f.tar.xz
forums-1e91f9b5542dd69caf60562566b5254365fd9e6f.zip
query_id return changed back ... I think somethins is afoot with my local repository ...
git-svn-id: file:///svn/phpbb/trunk@4396 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/includes/db/mysql.php7
1 files changed, 1 insertions, 6 deletions
diff --git a/phpBB/includes/db/mysql.php b/phpBB/includes/db/mysql.php
index 395809e6fa..cd9a074f35 100644
--- a/phpBB/includes/db/mysql.php
+++ b/phpBB/includes/db/mysql.php
@@ -120,12 +120,7 @@ class sql_db
{
global $cache;
- $this->query_result = false;
-
- if ($max_age && method_exists($cache, 'sql_load'))
- {
- $cache->sql_load($query, $max_age);
- }
+ $this->query_result = ($max_age && method_exists($cache, 'sql_load')) ? $cache->sql_load($query, $max_age) : false;
if (!$this->query_result)
{