3 files changed, 17 insertions, 12 deletions
diff --git a/phpBB/includes/db/db_tools.php b/phpBB/includes/db/db_tools.php
index 5786b40abe..cbf9b3f269 100644
--- a/phpBB/includes/db/db_tools.php
+++ b/phpBB/includes/db/db_tools.php
@@ -129,15 +129,15 @@ class phpbb_db_tools
 			'TINT:'		=> 'number(%d)',
 			'USINT'		=> 'number(4)',
 			'BOOL'		=> 'number(1)',
-			'VCHAR'		=> 'varchar2(255)',
-			'VCHAR:'	=> 'varchar2(%d)',
-			'CHAR:'		=> 'char(%d)',
-			'XSTEXT'	=> 'varchar2(1000)',
-			'STEXT'		=> 'varchar2(3000)',
+			'VCHAR'		=> 'varchar2(255 char)',
+			'VCHAR:'	=> 'varchar2(%d char)',
+			'CHAR:'		=> 'char(%d char)',
+			'XSTEXT'	=> 'varchar2(1000 char)',
+			'STEXT'		=> 'varchar2(3000 char)',
 			'TEXT'		=> 'clob',
 			'MTEXT'		=> 'clob',
-			'XSTEXT_UNI'=> 'varchar2(300)',
-			'STEXT_UNI'	=> 'varchar2(765)',
+			'XSTEXT_UNI'=> 'varchar2(100 char)',
+			'STEXT_UNI'	=> 'varchar2(255 char)',
 			'TEXT_UNI'	=> 'clob',
 			'MTEXT_UNI'	=> 'clob',
 			'TIMESTAMP'	=> 'number(11)',
@@ -145,9 +145,9 @@ class phpbb_db_tools
 			'DECIMAL:'	=> 'number(%d, 2)',
 			'PDECIMAL'	=> 'number(6, 3)',
 			'PDECIMAL:'	=> 'number(%d, 3)',
-			'VCHAR_UNI'	=> 'varchar2(765)',
-			'VCHAR_UNI:'=> array('varchar2(%d)', 'limit' => array('mult', 3, 765, 'clob')),
-			'VCHAR_CI'	=> 'varchar2(255)',
+			'VCHAR_UNI'	=> 'varchar2(255 char)',
+			'VCHAR_UNI:'=> 'varchar2(%d char)',
+			'VCHAR_CI'	=> 'varchar2(255 char)',
 			'VARBINARY'	=> 'raw(255)',
 		),
 
diff --git a/phpBB/includes/db/oracle.php b/phpBB/includes/db/oracle.php
index 95bdfe4174..36c80cf01c 100644
--- a/phpBB/includes/db/oracle.php
+++ b/phpBB/includes/db/oracle.php
@@ -50,7 +50,7 @@ class dbal_oracle extends dbal
 			$connect = $sqlserver . (($port) ? ':' . $port : '') . '/' . $database;
 		}
 
-		$this->db_connect_id = ($new_link) ? @oci_new_connect($this->user, $sqlpassword, $connect, 'UTF8') : (($this->persistency) ? @oci_pconnect($this->user, $sqlpassword, $connect, 'UTF8') : @oci_connect($this->user, $sqlpassword, $connect, 'UTF8'));
+		$this->db_connect_id = ($new_link) ? @oci_new_connect($this->user, $sqlpassword, $connect, 'AL32UTF8') : (($this->persistency) ? @oci_pconnect($this->user, $sqlpassword, $connect, 'AL32UTF8') : @oci_connect($this->user, $sqlpassword, $connect, 'AL32UTF8'));
 
 		return ($this->db_connect_id) ? $this->db_connect_id : $this->sql_error('');
 	}
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;