diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-06-13 00:09:46 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-06-13 00:09:46 +0200 |
| commit | ddea203492dce035677ca5125179c8c2907a2021 (patch) | |
| tree | 84dea39bdc3d257f3536a6ea8efa2f131bcfaa05 /phpBB | |
| parent | 8453587264e4130b9d6397b9a18c561c9f8830a9 (diff) | |
| parent | 25bd58d2f9755c9c434c6163af1368004fabb2c9 (diff) | |
| download | forums-ddea203492dce035677ca5125179c8c2907a2021.tar forums-ddea203492dce035677ca5125179c8c2907a2021.tar.gz forums-ddea203492dce035677ca5125179c8c2907a2021.tar.bz2 forums-ddea203492dce035677ca5125179c8c2907a2021.tar.xz forums-ddea203492dce035677ca5125179c8c2907a2021.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/9892] _sql in the updater needs to return the transaction results
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/install/database_update.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index db535fbddb..2835e11caa 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -610,11 +610,11 @@ function _sql($sql, &$errored, &$error_ary, $echo_dot = true) if ($sql === 'begin') { - $db->sql_transaction('begin'); + $result = $db->sql_transaction('begin'); } else if ($sql === 'commit') { - $db->sql_transaction('commit'); + $result = $db->sql_transaction('commit'); } else { |