aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/db
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2008-02-28 19:57:52 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2008-02-28 19:57:52 +0000
commitda966fed65f87807ecc6d4b003933fa2c5475fb7 (patch)
tree699b1a14352edaf346694c799151dd34e61f8f11 /phpBB/includes/db
parenta765c1aba14ee49801f43897cd90a69dcee7c3ca (diff)
downloadforums-da966fed65f87807ecc6d4b003933fa2c5475fb7.tar
forums-da966fed65f87807ecc6d4b003933fa2c5475fb7.tar.gz
forums-da966fed65f87807ecc6d4b003933fa2c5475fb7.tar.bz2
forums-da966fed65f87807ecc6d4b003933fa2c5475fb7.tar.xz
forums-da966fed65f87807ecc6d4b003933fa2c5475fb7.zip
#22355 and #22365
git-svn-id: file:///svn/phpbb/trunk@8421 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/db')
-rw-r--r--phpBB/includes/db/dbal.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/db/dbal.php b/phpBB/includes/db/dbal.php
index a12b5e494e..d385b98f55 100644
--- a/phpBB/includes/db/dbal.php
+++ b/phpBB/includes/db/dbal.php
@@ -610,7 +610,7 @@ class dbal
$this->sql_transaction('rollback');
}
- return $error;
+ return $this->sql_error_returned;
}
/**