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

#8082

Browse source 
git-svn-id: file:///svn/phpbb/trunk@7004 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
David M 2007-02-17 18:28:51 +00:00
parent 179d06c03e
commit e7de77fd8d
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/includes/functions_install.php
View file

@ -463,7 +463,6 @@ function connect_check_db($error_connect, &$error, $dbms, $table_prefix, $dbhost
break; break;
} }
$db->sql_close();
} }
if ($error_connect && (!isset($error) || !sizeof($error))) if ($error_connect && (!isset($error) || !sizeof($error)))

4
phpBB/install/convertors/convert_phpbb20.php
View file

@ -431,7 +431,7 @@ if (!$get_info)
'autoincrement' => 'rank_id', 'autoincrement' => 'rank_id',
array('rank_id', 'ranks.rank_id', ''), array('rank_id', 'ranks.rank_id', ''),
array('rank_title', 'ranks.rank_title', array('function1' => 'phpbb_set_encoding', 'function2' => 'utf8_htmlspecialchars')), array('rank_title', 'ranks.rank_title', array('function1' => 'phpbb_set_default_encoding', 'function2' => 'utf8_htmlspecialchars')),
array('rank_min', 'ranks.rank_min', array('typecast' => 'int', 'execute' => '{RESULT} = ({VALUE}[0] < 0) ? 0 : {VALUE}[0];')), array('rank_min', 'ranks.rank_min', array('typecast' => 'int', 'execute' => '{RESULT} = ({VALUE}[0] < 0) ? 0 : {VALUE}[0];')),
array('rank_special', 'ranks.rank_special', ''), array('rank_special', 'ranks.rank_special', ''),
array('rank_image', 'ranks.rank_image', 'import_rank'), array('rank_image', 'ranks.rank_image', 'import_rank'),
@ -615,7 +615,7 @@ if (!$get_info)
array( array(
'target' => PRIVMSGS_TABLE, 'target' => PRIVMSGS_TABLE,
'primary' => 'privmsgs.privmsgs_id', 'primary' => 'privmsgs.privmsgs_id',
'autoincrement' => 'privmsgs_id', 'autoincrement' => 'msg_id',
'query_first' => array( 'query_first' => array(
array('target', $convert->truncate_statement . PRIVMSGS_TABLE), array('target', $convert->truncate_statement . PRIVMSGS_TABLE),
array('target', $convert->truncate_statement . PRIVMSGS_RULES_TABLE), array('target', $convert->truncate_statement . PRIVMSGS_RULES_TABLE),

3
phpBB/install/install_convert.php
View file

@ -279,7 +279,7 @@ class install_convert extends module
while ($entry = readdir($handle)) while ($entry = readdir($handle))
{ {
if (preg_match('/^convert_([a-z0-9_]+).' . $phpEx . '/i', $entry, $m)) if (preg_match('/^convert_([a-z0-9_]+).' . $phpEx . '$/i', $entry, $m))
{ {
include('./convertors/' . $entry); include('./convertors/' . $entry);
if (isset($convertor_data)) if (isset($convertor_data))
@ -452,6 +452,7 @@ class install_convert extends module
if (!$result) if (!$result)
{ {
$prefixes = array(); $prefixes = array();
// TODO: fixme
if ($result = $src_db->sql_query('SHOW TABLES')) if ($result = $src_db->sql_query('SHOW TABLES'))
{ {
while ($row = $src_db->sql_fetchrow($result)) while ($row = $src_db->sql_fetchrow($result))