aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2008-01-29 15:00:41 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2008-01-29 15:00:41 +0000
commitfb1c5e22f6ac1cad6ddf9b6421bf21c00a95ae0c (patch)
tree2fbf34fb0ffde207316b799ad3f1e5df7621901e /phpBB/includes
parent5efd4f2c00c8d3f12a881d4fce54bc92986902c5 (diff)
downloadforums-fb1c5e22f6ac1cad6ddf9b6421bf21c00a95ae0c.tar
forums-fb1c5e22f6ac1cad6ddf9b6421bf21c00a95ae0c.tar.gz
forums-fb1c5e22f6ac1cad6ddf9b6421bf21c00a95ae0c.tar.bz2
forums-fb1c5e22f6ac1cad6ddf9b6421bf21c00a95ae0c.tar.xz
forums-fb1c5e22f6ac1cad6ddf9b6421bf21c00a95ae0c.zip
#17025
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8346 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/db/dbal.php7
1 files changed, 7 insertions, 0 deletions
diff --git a/phpBB/includes/db/dbal.php b/phpBB/includes/db/dbal.php
index e37ccda0db..4964ac87f7 100644
--- a/phpBB/includes/db/dbal.php
+++ b/phpBB/includes/db/dbal.php
@@ -262,6 +262,13 @@ class dbal
return true;
}
+ // Check if there is a transaction (no transaction can happen if there was an error, with a combined rollback and error returning enabled)
+ // This implies we have transaction always set for autocommit db's
+ if (!$this->transaction)
+ {
+ return false;
+ }
+
$result = $this->_sql_transaction('commit');
if (!$result)