mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-08 17:56:52 +02:00
Better support for nested transactions...
git-svn-id: file:///svn/phpbb/trunk@7469 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
@@ -1714,10 +1714,10 @@ function phpbb_check_username_collisions()
|
||||
break;
|
||||
}
|
||||
|
||||
$db->return_on_error = true;
|
||||
$db->sql_return_on_error(true);
|
||||
$db->sql_query($drop_sql);
|
||||
$db->sql_query($create_sql);
|
||||
$db->return_on_error = false;
|
||||
$db->sql_return_on_error(false);
|
||||
|
||||
// now select all user_ids and usernames and then convert the username (this can take quite a while!)
|
||||
$sql = 'SELECT user_id, username
|
||||
|
@@ -1095,7 +1095,7 @@ class install_install extends module
|
||||
$db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false, false);
|
||||
|
||||
// NOTE: trigger_error does not work here.
|
||||
$db->return_on_error = true;
|
||||
$db->sql_return_on_error(true);
|
||||
|
||||
// If mysql is chosen, we need to adjust the schema filename slightly to reflect the correct version. ;)
|
||||
if ($dbms == 'mysql')
|
||||
@@ -1380,7 +1380,7 @@ class install_install extends module
|
||||
$db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false, false);
|
||||
|
||||
// NOTE: trigger_error does not work here.
|
||||
$db->return_on_error = true;
|
||||
$db->sql_return_on_error(true);
|
||||
|
||||
include_once($phpbb_root_path . 'includes/constants.' . $phpEx);
|
||||
include_once($phpbb_root_path . 'includes/acp/acp_modules.' . $phpEx);
|
||||
|
Reference in New Issue
Block a user