aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2008-08-21 14:19:42 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2008-08-21 14:19:42 +0000
commit7e28be59684bf391c1cc58c480f7ed7dfba0f093 (patch)
tree9efb273ccea323cbe51e9b209a88744e1cc2ce14 /phpBB/includes
parent9db6e7caa6d1224027dbd958db12e0c8969852c2 (diff)
downloadforums-7e28be59684bf391c1cc58c480f7ed7dfba0f093.tar
forums-7e28be59684bf391c1cc58c480f7ed7dfba0f093.tar.gz
forums-7e28be59684bf391c1cc58c480f7ed7dfba0f093.tar.bz2
forums-7e28be59684bf391c1cc58c480f7ed7dfba0f093.tar.xz
forums-7e28be59684bf391c1cc58c480f7ed7dfba0f093.zip
close db connection before delivering file. Also make sure connection can't be closed twice.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8772 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/db/dbal.php8
1 files changed, 7 insertions, 1 deletions
diff --git a/phpBB/includes/db/dbal.php b/phpBB/includes/db/dbal.php
index e55a565ea4..6bec685061 100644
--- a/phpBB/includes/db/dbal.php
+++ b/phpBB/includes/db/dbal.php
@@ -138,7 +138,13 @@ class dbal
$this->sql_freeresult($query_id);
}
- return $this->_sql_close();
+ // Connection closed correctly. Set db_connect_id to false to prevent errors
+ if (($result = $this->_sql_close()))
+ {
+ $this->db_connect_id = false;
+ }
+
+ return $result;
}
/**