makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-06 10:08:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

#8084

Browse source 
git-svn-id: file:///svn/phpbb/trunk@6984 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
David M 2007-02-13 00:14:39 +00:00
parent 4d1a25e8a1
commit 4c487c1cdc
3 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/acp/acp_database.php
View file

@ -1494,7 +1494,7 @@ class acp_database
} }
else else
{ {
$row['rowdefault'] = $db->sql_fetchfield('rowdefault', 0, $def_res); $row['rowdefault'] = $db->sql_fetchfield('rowdefault', false, $def_res);
} }
$db->sql_freeresult($def_res); $db->sql_freeresult($def_res);

5
phpBB/includes/functions_convert.php
View file

@ -1647,7 +1647,7 @@ function add_bots()
$sql = 'SELECT group_id FROM ' . GROUPS_TABLE . " WHERE group_name = 'BOTS'"; $sql = 'SELECT group_id FROM ' . GROUPS_TABLE . " WHERE group_name = 'BOTS'";
$result = $db->sql_query($sql); $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); $db->sql_freeresult($result);
if (!$group_id) if (!$group_id)
@ -1656,11 +1656,12 @@ function add_bots()
$sql = 'SELECT group_id FROM ' . GROUPS_TABLE . " WHERE group_name = 'BOTS'"; $sql = 'SELECT group_id FROM ' . GROUPS_TABLE . " WHERE group_name = 'BOTS'";
$result = $db->sql_query($sql); $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); $db->sql_freeresult($result);
if (!$group_id) if (!$group_id)
{ {
global $install;
$install->error($user->lang['CONV_ERROR_INCONSISTENT_GROUPS'], __LINE__, __FILE__); $install->error($user->lang['CONV_ERROR_INCONSISTENT_GROUPS'], __LINE__, __FILE__);
} }
} }

16
phpBB/install/convertors/functions_phpbb20.php
View file

@ -76,6 +76,14 @@ function phpbb_insert_forums()
$db->sql_query("SET NAMES 'utf8'"); $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(); $cats_added = array();
while ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))
{ {
@ -259,6 +267,14 @@ function phpbb_insert_forums()
$db->sql_query($sql); $db->sql_query($sql);
} }
$db->sql_freeresult($result); $db->sql_freeresult($result);
switch ($db->sql_layer)
{
case 'mssql':
case 'mssql_odbc':
$db->sql_query('SET IDENTITY_INSERT ' . FORUMS_TABLE . ' OFF');
break;
}
} }
/** /**