diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-06-13 00:09:37 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-06-13 00:09:37 +0200 |
| commit | 25bd58d2f9755c9c434c6163af1368004fabb2c9 (patch) | |
| tree | 9af073237786360bd4f36709bcae70e7815be4eb /phpBB | |
| parent | d724c3afac8feb174c412d4444b5cb747982de2e (diff) | |
| parent | c9e22ac5098d0ff6c66256965f16daa7511e3e58 (diff) | |
| download | forums-25bd58d2f9755c9c434c6163af1368004fabb2c9.tar forums-25bd58d2f9755c9c434c6163af1368004fabb2c9.tar.gz forums-25bd58d2f9755c9c434c6163af1368004fabb2c9.tar.bz2 forums-25bd58d2f9755c9c434c6163af1368004fabb2c9.tar.xz forums-25bd58d2f9755c9c434c6163af1368004fabb2c9.zip | |
Merge remote-tracking branch 'naderman/ticket/9892' into develop-olympus
* naderman/ticket/9892:
[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 8214dd0f2b..75b8644105 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -543,11 +543,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 { |