mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 05:50:42 +02:00
Code Issues Releases Wiki Activity

needed fixes

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@7929 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2007-07-23 16:25:26 +00:00
parent 4373e62a56
commit d4fb1870be
2 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
phpBB/install/install_install.php
View File

@@ -62,7 +62,7 @@ class install_install extends module
switch ($sub)
{
case 'intro' :
case 'intro':
$this->page_title = $lang['SUB_INTRO'];
$template->assign_vars(array(
@@ -75,27 +75,27 @@ class install_install extends module
break;
case 'requirements' :
case 'requirements':
$this->check_server_requirements($mode, $sub);
break;
case 'database' :
case 'database':
$this->obtain_database_settings($mode, $sub);
break;
case 'administrator' :
case 'administrator':
$this->obtain_admin_settings($mode, $sub);
break;
case 'config_file' :
case 'config_file':
$this->create_config_file($mode, $sub);
break;
case 'advanced' :
case 'advanced':
$this->obtain_advanced_settings($mode, $sub);
break;
@@ -104,7 +104,7 @@ class install_install extends module
$this->load_schema($mode, $sub);
break;
case 'final' :
case 'final':
$this->build_search_index($mode, $sub);
$this->add_modules($mode, $sub);
$this->add_language($mode, $sub);
@@ -1388,6 +1388,7 @@ class install_install extends module
// Obtain any submitted data
$data = $this->get_submitted_data();
$table_prefix = $data['table_prefix'];
// If we get here and the extension isn't loaded it should be safe to just go ahead and load it
$available_dbms = get_available_dbms($data['dbms']);
@@ -1439,7 +1440,6 @@ class install_install extends module
{
global $db, $lang, $phpbb_root_path, $phpEx;
include_once($phpbb_root_path . 'includes/constants.' . $phpEx);
include_once($phpbb_root_path . 'includes/acp/acp_modules.' . $phpEx);
$_module = &new acp_modules();
@@ -1857,9 +1857,6 @@ class install_install extends module
// Obtain any submitted data
$data = $this->get_submitted_data();
// Load the basic configuration data
include_once($phpbb_root_path . 'includes/constants.' . $phpEx);
$sql = 'SELECT *
FROM ' . CONFIG_TABLE;
$result = $db->sql_query($sql);