mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-16 05:34:01 +02:00
Code Issues Releases Wiki Activity

Adjust some files to support new methods...

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@9279 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2009-01-19 15:24:24 +00:00
parent abee782518
commit 14eb46cda0
11 changed files with 265 additions and 1688 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1517
phpBB/install/database_update.php
View File

File diff suppressed because it is too large Load Diff

2
phpBB/install/install_convert.php
View File

@@ -419,7 +419,7 @@ class install_convert extends module
}
else
{
$connect_test = connect_check_db(true, $error, $available_dbms[$src_dbms], $src_table_prefix, $src_dbhost, $src_dbuser, htmlspecialchars_decode($src_dbpasswd), $src_dbname, $src_dbport, true, ($src_dbms == $dbms) ? false : true, false);
$connect_test = connect_check_db($available_dbms[$src_dbms], $src_table_prefix, $src_dbhost, $src_dbuser, htmlspecialchars_decode($src_dbpasswd), $src_dbname, $src_dbport, $error, ($src_dbms == $dbms) ? false : true);
}
// The forum prefix of the old and the new forum can only be the same if two different databases are used.

7
phpBB/install/install_install.php
View File

@@ -601,7 +601,7 @@ class install_install extends module
}
else
{
$connect_test = connect_check_db(true, $error, $available_dbms[$data['dbms']], $data['table_prefix'], $data['dbhost'], $data['dbuser'], htmlspecialchars_decode($data['dbpasswd']), $data['dbname'], $data['dbport']);
$connect_test = connect_check_db($available_dbms[$data['dbms']], $data['table_prefix'], $data['dbhost'], $data['dbuser'], htmlspecialchars_decode($data['dbpasswd']), $data['dbname'], $data['dbport'], $error);
}
if ($connect_test)
@@ -965,9 +965,6 @@ class install_install extends module
// we do not return statements, we simply let them execute
$db_tools = new phpbb_db_tools(phpbb::$db);
// Before we can load the schema data we need (for a new installation) create custom data for the beginning of schema creation and the end
$db_tools->sql_install_begin();
foreach ($schema_data as $table_name => $table_data)
{
// Change prefix, we always have phpbb_, therefore we can do a substr() here
@@ -977,8 +974,6 @@ class install_install extends module
$db_tools->sql_create_table($table_name, $table_data);
}
$db_tools->sql_install_end();
// Now get the schema data
include PHPBB_ROOT_PATH . 'install/schemas/schema_data.' . PHP_EXT;