aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_install.php
diff options
context:
space:
mode:
authorDavid M <davidmj@users.sourceforge.net>2008-01-09 00:21:29 +0000
committerDavid M <davidmj@users.sourceforge.net>2008-01-09 00:21:29 +0000
commitb9b46a8b454b2ad34ff1a15b0cfd7bd9eb969cb6 (patch)
tree883940915839e972c677d67c5f7ae39ab6175e80 /phpBB/includes/functions_install.php
parent7193d91e4006307e18e602f22495476ee4c7a1db (diff)
downloadforums-b9b46a8b454b2ad34ff1a15b0cfd7bd9eb969cb6.tar
forums-b9b46a8b454b2ad34ff1a15b0cfd7bd9eb969cb6.tar.gz
forums-b9b46a8b454b2ad34ff1a15b0cfd7bd9eb969cb6.tar.bz2
forums-b9b46a8b454b2ad34ff1a15b0cfd7bd9eb969cb6.tar.xz
forums-b9b46a8b454b2ad34ff1a15b0cfd7bd9eb969cb6.zip
- phpBB now uses a less ancient version of Oracle
git-svn-id: file:///svn/phpbb/trunk@8317 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_install.php')
-rw-r--r--phpBB/includes/functions_install.php7
1 files changed, 6 insertions, 1 deletions
diff --git a/phpBB/includes/functions_install.php b/phpBB/includes/functions_install.php
index 31085344f8..cdd62b6d9e 100644
--- a/phpBB/includes/functions_install.php
+++ b/phpBB/includes/functions_install.php
@@ -492,10 +492,15 @@ function connect_check_db($error_connect, &$error, $dbms_details, $table_prefix,
}
$db->sql_freeresult($result);
- if (version_compare($stats['NLS_RDBMS_VERSION'], '9.2', '<') && $stats['NLS_CHARACTERSET'] !== 'UTF8')
+ if (version_compare($stats['NLS_RDBMS_VERSION'], '9.2', '<'))
{
$error[] = $lang['INST_ERR_DB_NO_ORACLE'];
}
+
+ if ($stats['NLS_CHARACTERSET'] !== 'AL32UTF8')
+ {
+ $error[] = $lang['INST_ERR_DB_NO_ORACLE_NLS'];
+ }
}
break;