diff options
| -rw-r--r-- | phpBB/install/install_convert.php | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/phpBB/install/install_convert.php b/phpBB/install/install_convert.php index f222dd7fa6..fe44433f33 100644 --- a/phpBB/install/install_convert.php +++ b/phpBB/install/install_convert.php @@ -295,7 +295,7 @@ class install_convert extends module if (isset($convertor_data)) { $sort[strtolower($convertor_data['forum_name'])] = sizeof($convertors); - + $convertors[] = array( 'tag' => $m[1], 'forum_name' => $convertor_data['forum_name'], @@ -582,7 +582,7 @@ class install_convert extends module function convert_data($sub) { global $template, $user, $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.' . PHP_EXT); require(PHPBB_ROOT_PATH . 'includes/constants.' . PHP_EXT); @@ -613,7 +613,7 @@ class install_convert extends module // Set up a user as well. We _should_ have enough of a database here at this point to do this // and it helps for any core code we call $user->session_begin(); - $user->page = $user->extract_current_page(PHPBB_ROOT_PATH); + $user->page = session::extract_current_page(PHPBB_ROOT_PATH); // This is a little bit of a fudge, but it allows the language entries to be available to the // core code without us loading them again @@ -884,7 +884,7 @@ class install_convert extends module { $table = $convert->src_table_prefix . $m[1]; $tables_list[$table] = $table; - + if (!empty($m[3])) { $aliases[] = $convert->src_table_prefix . $m[3]; @@ -941,7 +941,7 @@ class install_convert extends module // 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 - + if (sizeof($missing_tables) == sizeof($tables_list)) { $this->p_master->error($user->lang['NO_TABLES_FOUND'] . ' ' . $user->lang['CHECK_TABLE_PREFIX'], __LINE__, __FILE__); @@ -1289,7 +1289,7 @@ class install_convert extends module if ($errored) { $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 // is caused by duplicate entries - but we also do not want to miss one... foreach ($waiting_rows as $waiting_sql) @@ -1596,7 +1596,7 @@ class install_convert extends module 'TITLE' => $user->lang['UPDATE_TOPICS_POSTED'], 'RESULT' => $user->lang['DONE'], )); - + if ($db->sql_error_triggered) { $template->assign_vars(array( @@ -1606,7 +1606,7 @@ class install_convert extends module )); } $db->sql_return_on_error(false); - + $this->finish_conversion(); return; } @@ -1938,7 +1938,7 @@ class install_convert extends module $firstkey_set = false; $firstkey = 0; - + foreach ($fields[1] as $inner_key => $inner_value) { if (!$firstkey_set) @@ -1963,7 +1963,7 @@ class install_convert extends module { $sql_flag = true; } - + // No function assigned? if (empty($fields[2])) { |