3 files changed, 14 insertions, 6 deletions
diff --git a/phpBB/phpbb/install/helper/config.php b/phpBB/phpbb/install/helper/config.php
index fad6749019..7eb0ae3b05 100644
--- a/phpBB/phpbb/install/helper/config.php
+++ b/phpBB/phpbb/install/helper/config.php
@@ -330,6 +330,8 @@ class config
 
 		fwrite($fp, $file_content);
 		fclose($fp);
+		// Enforce 0600 permission for install config
+		$this->filesystem->chmod([$this->install_config_file], 0600);
 	}
 
 	/**
diff --git a/phpBB/phpbb/install/helper/database.php b/phpBB/phpbb/install/helper/database.php
index 59b86a8ca7..fa5a10c6fc 100644
--- a/phpBB/phpbb/install/helper/database.php
+++ b/phpBB/phpbb/install/helper/database.php
@@ -76,7 +76,7 @@ class database
 			'LABEL'			=> 'Oracle',
 			'SCHEMA'		=> 'oracle',
 			'MODULE'		=> 'oci8',
-			'DELIM'			=> '/',
+			'DELIM'			=> ';',
 			'DRIVER'		=> 'phpbb\db\driver\oracle',
 			'AVAILABLE'		=> true,
 			'2.0.x'			=> false,
@@ -338,7 +338,7 @@ class database
 
 		// Check if SQLite database is writable
 		if ($dbms_info['SCHEMA'] === 'sqlite'
-			&& (!$this->filesystem->is_writable($dbhost) || !$this->filesystem->is_writable(pathinfo($dbhost, PATHINFO_DIRNAME))))
+			&& (($this->filesystem->exists($dbhost) && !$this->filesystem->is_writable($dbhost)) || !$this->filesystem->is_writable(pathinfo($dbhost, PATHINFO_DIRNAME))))
 		{
 			$errors[] = array(
 				'title' =>'INST_ERR_DB_NO_WRITABLE',
@@ -372,7 +372,7 @@ class database
 			$tables = array_map('strtolower', $tables);
 			$table_intersect = array_intersect($tables, $table_ary);
 
-			if (sizeof($table_intersect))
+			if (count($table_intersect))
 			{
 				$errors[] = array(
 					'title' => 'INST_ERR_PREFIX',
diff --git a/phpBB/phpbb/install/helper/iohandler/ajax_iohandler.php b/phpBB/phpbb/install/helper/iohandler/ajax_iohandler.php
index bce0149890..2a608f504e 100644
--- a/phpBB/phpbb/install/helper/iohandler/ajax_iohandler.php
+++ b/phpBB/phpbb/install/helper/iohandler/ajax_iohandler.php
@@ -187,6 +187,7 @@ class ajax_iohandler extends iohandler_base
 			$tpl_ary['KEY'] = $input_name;
 			$tpl_ary['S_EXPLAIN'] = false;
 			$tpl_ary['DISABLED'] = isset($input_options['disabled']) ? $input_options['disabled'] : false;
+			$tpl_ary['IS_SECONDARY'] = isset($input_options['is_secondary']) ? $input_options['is_secondary'] : false;
 
 			if (isset($input_options['default']))
 			{
@@ -203,7 +204,7 @@ class ajax_iohandler extends iohandler_base
 
 			if (in_array($input_options['type'], array('select', 'radio'), true))
 			{
-				for ($i = 0, $total = sizeof($input_options['options']); $i < $total; $i++)
+				for ($i = 0, $total = count($input_options['options']); $i < $total; $i++)
 				{
 					if (isset($input_options['options'][$i]['label']))
 					{
@@ -218,6 +219,11 @@ class ajax_iohandler extends iohandler_base
 			$this->template->assign_block_vars($block_name, $tpl_ary);
 		}
 
+		if (isset($form['database_update_submit']) && !$form['database_update_submit']['disabled'])
+		{
+			$this->template->assign_var('FORM_TITLE', $this->language->lang('UPDATE_CONTINUE_UPDATE_PROCESS'));
+		}
+
 		$this->template->assign_var('S_NOT_ONLY_BUTTON_FORM', $not_button_form);
 
 		if (!$not_button_form)
@@ -375,7 +381,7 @@ class ajax_iohandler extends iohandler_base
 	 */
 	public function set_active_stage_menu($menu_path)
 	{
-		$this->nav_data['active'] = $menu_path[sizeof($menu_path) - 1];
+		$this->nav_data['active'] = $menu_path[count($menu_path) - 1];
 		$this->send_response();
 	}
 
@@ -384,7 +390,7 @@ class ajax_iohandler extends iohandler_base
 	 */
 	public function set_finished_stage_menu($menu_path)
 	{
-		$this->nav_data['finished'][] = $menu_path[sizeof($menu_path) - 1];
+		$this->nav_data['finished'][] = $menu_path[count($menu_path) - 1];
 		$this->send_response();
 	}