diff options
| author | David M <davidmj@users.sourceforge.net> | 2007-02-13 00:14:39 +0000 |
|---|---|---|
| committer | David M <davidmj@users.sourceforge.net> | 2007-02-13 00:14:39 +0000 |
| commit | 4c487c1cdc03f50d7aee4021588572a9358e06ec (patch) | |
| tree | e26a4b57f7aca90cefcc64949e8966ff02875936 /phpBB | |
| parent | 4d1a25e8a16172e358ce5f4460c3e52dad034d0c (diff) | |
| download | forums-4c487c1cdc03f50d7aee4021588572a9358e06ec.tar forums-4c487c1cdc03f50d7aee4021588572a9358e06ec.tar.gz forums-4c487c1cdc03f50d7aee4021588572a9358e06ec.tar.bz2 forums-4c487c1cdc03f50d7aee4021588572a9358e06ec.tar.xz forums-4c487c1cdc03f50d7aee4021588572a9358e06ec.zip | |
#8084
git-svn-id: file:///svn/phpbb/trunk@6984 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/acp/acp_database.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/functions_convert.php | 5 | ||||
| -rw-r--r-- | phpBB/install/convertors/functions_phpbb20.php | 16 |
3 files changed, 20 insertions, 3 deletions
diff --git a/phpBB/includes/acp/acp_database.php b/phpBB/includes/acp/acp_database.php index 87c40ef78f..f09856b7fa 100644 --- a/phpBB/includes/acp/acp_database.php +++ b/phpBB/includes/acp/acp_database.php @@ -1494,7 +1494,7 @@ class acp_database } else { - $row['rowdefault'] = $db->sql_fetchfield('rowdefault', 0, $def_res); + $row['rowdefault'] = $db->sql_fetchfield('rowdefault', false, $def_res); } $db->sql_freeresult($def_res); diff --git a/phpBB/includes/functions_convert.php b/phpBB/includes/functions_convert.php index ee97dcb3ab..6df29fc0f4 100644 --- a/phpBB/includes/functions_convert.php +++ b/phpBB/includes/functions_convert.php @@ -1647,7 +1647,7 @@ function add_bots() $sql = 'SELECT group_id FROM ' . GROUPS_TABLE . " WHERE group_name = 'BOTS'"; $result = $db->sql_query($sql); - $group_id = (int) $db->sql_fetchfield('group_id', 0, $result); + $group_id = (int) $db->sql_fetchfield('group_id', false, $result); $db->sql_freeresult($result); if (!$group_id) @@ -1656,11 +1656,12 @@ function add_bots() $sql = 'SELECT group_id FROM ' . GROUPS_TABLE . " WHERE group_name = 'BOTS'"; $result = $db->sql_query($sql); - $group_id = (int) $db->sql_fetchfield('group_id', 0, $result); + $group_id = (int) $db->sql_fetchfield('group_id', false, $result); $db->sql_freeresult($result); if (!$group_id) { + global $install; $install->error($user->lang['CONV_ERROR_INCONSISTENT_GROUPS'], __LINE__, __FILE__); } } diff --git a/phpBB/install/convertors/functions_phpbb20.php b/phpBB/install/convertors/functions_phpbb20.php index eb660f84d0..fdde80c82c 100644 --- a/phpBB/install/convertors/functions_phpbb20.php +++ b/phpBB/install/convertors/functions_phpbb20.php @@ -76,6 +76,14 @@ function phpbb_insert_forums() $db->sql_query("SET NAMES 'utf8'"); } + switch ($db->sql_layer) + { + case 'mssql': + case 'mssql_odbc': + $db->sql_query('SET IDENTITY_INSERT ' . FORUMS_TABLE . ' ON'); + break; + } + $cats_added = array(); while ($row = $db->sql_fetchrow($result)) { @@ -259,6 +267,14 @@ function phpbb_insert_forums() $db->sql_query($sql); } $db->sql_freeresult($result); + + switch ($db->sql_layer) + { + case 'mssql': + case 'mssql_odbc': + $db->sql_query('SET IDENTITY_INSERT ' . FORUMS_TABLE . ' OFF'); + break; + } } /** |