aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/install/convertors/functions_phpbb20.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-05-05 10:22:24 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-05-05 10:22:24 +0000
commita5704a0b01b2f549aad0c1722ae3b136a9c55f1e (patch)
tree44092e3287dc4f91d494073f541675f7f4475412 /phpBB/install/convertors/functions_phpbb20.php
parenteee1dedc13627283dfc1cfc5aa00f769fa061df7 (diff)
downloadforums-a5704a0b01b2f549aad0c1722ae3b136a9c55f1e.tar
forums-a5704a0b01b2f549aad0c1722ae3b136a9c55f1e.tar.gz
forums-a5704a0b01b2f549aad0c1722ae3b136a9c55f1e.tar.bz2
forums-a5704a0b01b2f549aad0c1722ae3b136a9c55f1e.tar.xz
forums-a5704a0b01b2f549aad0c1722ae3b136a9c55f1e.zip
Better support for nested transactions...
git-svn-id: file:///svn/phpbb/trunk@7469 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/install/convertors/functions_phpbb20.php')
-rw-r--r--phpBB/install/convertors/functions_phpbb20.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/install/convertors/functions_phpbb20.php b/phpBB/install/convertors/functions_phpbb20.php
index 85960bfb70..7f51b90787 100644
--- a/phpBB/install/convertors/functions_phpbb20.php
+++ b/phpBB/install/convertors/functions_phpbb20.php
@@ -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