mirror of
https://github.com/phpbb/phpbb.git
synced 2025-02-25 04:23:38 +01:00
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/9892] _sql in the updater needs to return the transaction results
This commit is contained in:
commit
ddea203492
@ -610,11 +610,11 @@ function _sql($sql, &$errored, &$error_ary, $echo_dot = true)
|
|||||||
|
|
||||||
if ($sql === 'begin')
|
if ($sql === 'begin')
|
||||||
{
|
{
|
||||||
$db->sql_transaction('begin');
|
$result = $db->sql_transaction('begin');
|
||||||
}
|
}
|
||||||
else if ($sql === 'commit')
|
else if ($sql === 'commit')
|
||||||
{
|
{
|
||||||
$db->sql_transaction('commit');
|
$result = $db->sql_transaction('commit');
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user