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

#9554

Browse source 
git-svn-id: file:///svn/phpbb/trunk@7270 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
David M 2007-04-02 22:10:31 +00:00
parent 105f75016c
commit 0c6afd4f0b
2 changed files with 28 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
phpBB/includes/functions_install.php
View file

@ -246,7 +246,7 @@ function get_tables($db)
* @param array $dbms should be of the format of an element of the array returned by {@link get_available_dbms get_available_dbms()}
* necessary extensions should be loaded already
*/
function connect_check_db($error_connect, &$error, $dbms, $table_prefix, $dbhost, $dbuser, $dbpasswd, $dbname, $dbport, $prefix_may_exist = false, $load_dbal = true)
function connect_check_db($error_connect, &$error, $dbms, $table_prefix, $dbhost, $dbuser, $dbpasswd, $dbname, $dbport, $prefix_may_exist = false, $load_dbal = true, $unicode_check = true)
{
global $phpbb_root_path, $phpEx, $config, $lang;
@ -435,6 +435,8 @@ function connect_check_db($error_connect, &$error, $dbms, $table_prefix, $dbhost
break;
case 'oracle':
if ($unicode_check)
{
$sql = "SELECT *
FROM NLS_DATABASE_PARAMETERS
WHERE PARAMETER = 'NLS_RDBMS_VERSION'
@ -451,9 +453,12 @@ function connect_check_db($error_connect, &$error, $dbms, $table_prefix, $dbhost
{
$error[] = $lang['INST_ERR_DB_NO_ORACLE'];
}
}
break;
case 'postgres':
if ($unicode_check)
{
$sql = "SHOW server_encoding;";
$result = $db->sql_query($sql);
$row = $db->sql_fetchrow($result);
@ -463,6 +468,7 @@ function connect_check_db($error_connect, &$error, $dbms, $table_prefix, $dbhost
{
$error[] = $lang['INST_ERR_DB_NO_POSTGRES'];
}
}
break;
}

2
phpBB/install/install_convert.php
View file

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