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

#28635

Browse source 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8615 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2008-06-07 13:50:39 +00:00
parent cf8eef783b
commit bf9723dc2c
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
phpBB/install/install_convert.php
View file

@ -298,7 +298,7 @@ class install_convert extends module
if (isset($convertor_data)) if (isset($convertor_data))
{ {
$sort[strtolower($convertor_data['forum_name'])] = sizeof($convertors); $sort[strtolower($convertor_data['forum_name'])] = sizeof($convertors);
$convertors[] = array( $convertors[] = array(
'tag' => $m[1], 'tag' => $m[1],
'forum_name' => $convertor_data['forum_name'], 'forum_name' => $convertor_data['forum_name'],
@ -585,7 +585,7 @@ class install_convert extends module
function convert_data($sub) function convert_data($sub)
{ {
global $template, $user, $phpbb_root_path, $phpEx, $db, $lang, $config, $cache; global $template, $user, $phpbb_root_path, $phpEx, $db, $lang, $config, $cache;
global $convert, $convert_row, $message_parser, $skip_rows; global $convert, $convert_row, $message_parser, $skip_rows, $language;
require($phpbb_root_path . 'config.' . $phpEx); require($phpbb_root_path . 'config.' . $phpEx);
require($phpbb_root_path . 'includes/constants.' . $phpEx); require($phpbb_root_path . 'includes/constants.' . $phpEx);
@ -891,7 +891,7 @@ class install_convert extends module
{ {
$table = $convert->src_table_prefix . $m[1]; $table = $convert->src_table_prefix . $m[1];
$tables_list[$table] = $table; $tables_list[$table] = $table;
if (!empty($m[3])) if (!empty($m[3]))
{ {
$aliases[] = $convert->src_table_prefix . $m[3]; $aliases[] = $convert->src_table_prefix . $m[3];
@ -948,7 +948,7 @@ class install_convert extends module
// Throw an error if some tables are missing // Throw an error if some tables are missing
// We used to do some guessing here, but since we have a suggestion of possible values earlier, I don't see it adding anything here to do it again // We used to do some guessing here, but since we have a suggestion of possible values earlier, I don't see it adding anything here to do it again
if (sizeof($missing_tables) == sizeof($tables_list)) if (sizeof($missing_tables) == sizeof($tables_list))
{ {
$this->p_master->error($user->lang['NO_TABLES_FOUND'] . ' ' . $user->lang['CHECK_TABLE_PREFIX'], __LINE__, __FILE__); $this->p_master->error($user->lang['NO_TABLES_FOUND'] . ' ' . $user->lang['CHECK_TABLE_PREFIX'], __LINE__, __FILE__);
@ -1299,7 +1299,7 @@ class install_convert extends module
if ($errored) if ($errored)
{ {
$db->sql_return_on_error(true); $db->sql_return_on_error(true);
// Because it errored out we will try to insert the rows one by one... most of the time this // Because it errored out we will try to insert the rows one by one... most of the time this
// is caused by duplicate entries - but we also do not want to miss one... // is caused by duplicate entries - but we also do not want to miss one...
foreach ($waiting_rows as $waiting_sql) foreach ($waiting_rows as $waiting_sql)
@ -1607,7 +1607,7 @@ class install_convert extends module
'TITLE' => $user->lang['UPDATE_TOPICS_POSTED'], 'TITLE' => $user->lang['UPDATE_TOPICS_POSTED'],
'RESULT' => $user->lang['DONE'], 'RESULT' => $user->lang['DONE'],
)); ));
if ($db->sql_error_triggered) if ($db->sql_error_triggered)
{ {
$template->assign_vars(array( $template->assign_vars(array(
@ -1617,7 +1617,7 @@ class install_convert extends module
)); ));
} }
$db->sql_return_on_error(false); $db->sql_return_on_error(false);
$this->finish_conversion(); $this->finish_conversion();
return; return;
} }
@ -1949,7 +1949,7 @@ class install_convert extends module
$firstkey_set = false; $firstkey_set = false;
$firstkey = 0; $firstkey = 0;
foreach ($fields[1] as $inner_key => $inner_value) foreach ($fields[1] as $inner_key => $inner_value)
{ {
if (!$firstkey_set) if (!$firstkey_set)
@ -1974,7 +1974,7 @@ class install_convert extends module
{ {
$sql_flag = true; $sql_flag = true;
} }
// No function assigned? // No function assigned?
if (empty($fields[2])) if (empty($fields[2]))
{ {