1 files changed, 31 insertions, 29 deletions
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index 536b7142d5..2965c560d9 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -2078,36 +2078,38 @@ class install_install extends module
 	*/
 	function get_submitted_data()
 	{
+		global $request;
+
 		return array(
-			'language'		=> basename(request_var('language', '')),
-			'dbms'			=> request_var('dbms', ''),
-			'dbhost'		=> request_var('dbhost', '', true),
-			'dbport'		=> request_var('dbport', ''),
-			'dbuser'		=> request_var('dbuser', ''),
-			'dbpasswd'		=> request_var('dbpasswd', '', true),
-			'dbname'		=> request_var('dbname', ''),
-			'table_prefix'	=> request_var('table_prefix', ''),
-			'default_lang'	=> basename(request_var('default_lang', '')),
-			'admin_name'	=> utf8_normalize_nfc(request_var('admin_name', '', true)),
-			'admin_pass1'	=> request_var('admin_pass1', '', true),
-			'admin_pass2'	=> request_var('admin_pass2', '', true),
-			'board_email'	=> strtolower(request_var('board_email', '')),
-			'img_imagick'	=> request_var('img_imagick', ''),
-			'ftp_path'		=> request_var('ftp_path', ''),
-			'ftp_user'		=> request_var('ftp_user', ''),
-			'ftp_pass'		=> request_var('ftp_pass', ''),
-			'email_enable'	=> request_var('email_enable', ''),
-			'smtp_delivery'	=> request_var('smtp_delivery', ''),
-			'smtp_host'		=> request_var('smtp_host', ''),
-			'smtp_auth'		=> request_var('smtp_auth', ''),
-			'smtp_user'		=> request_var('smtp_user', ''),
-			'smtp_pass'		=> request_var('smtp_pass', ''),
-			'cookie_secure'	=> request_var('cookie_secure', ''),
-			'force_server_vars'	=> request_var('force_server_vars', ''),
-			'server_protocol'	=> request_var('server_protocol', ''),
-			'server_name'	=> request_var('server_name', ''),
-			'server_port'	=> request_var('server_port', ''),
-			'script_path'	=> request_var('script_path', ''),
+			'language'		=> basename($request->variable('language', '')),
+			'dbms'			=> $request->variable('dbms', ''),
+			'dbhost'		=> $request->variable('dbhost', ''),
+			'dbport'		=> $request->variable('dbport', ''),
+			'dbuser'		=> $request->variable('dbuser', ''),
+			'dbpasswd'		=> $request->variable('dbpasswd', '', true),
+			'dbname'		=> $request->variable('dbname', ''),
+			'table_prefix'	=> $request->variable('table_prefix', ''),
+			'default_lang'	=> basename($request->variable('default_lang', '')),
+			'admin_name'	=> $request->variable('admin_name', '', true),
+			'admin_pass1'	=> $request->variable('admin_pass1', '', true),
+			'admin_pass2'	=> $request->variable('admin_pass2', '', true),
+			'board_email'	=> strtolower($request->variable('board_email', '')),
+			'img_imagick'	=> $request->variable('img_imagick', ''),
+			'ftp_path'		=> $request->variable('ftp_path', ''),
+			'ftp_user'		=> $request->variable('ftp_user', ''),
+			'ftp_pass'		=> $request->variable('ftp_pass', ''),
+			'email_enable'	=> $request->variable('email_enable', ''),
+			'smtp_delivery'	=> $request->variable('smtp_delivery', ''),
+			'smtp_host'		=> $request->variable('smtp_host', ''),
+			'smtp_auth'		=> $request->variable('smtp_auth', ''),
+			'smtp_user'		=> $request->variable('smtp_user', ''),
+			'smtp_pass'		=> $request->variable('smtp_pass', ''),
+			'cookie_secure'	=> $request->variable('cookie_secure', ''),
+			'force_server_vars'	=> $request->variable('force_server_vars', ''),
+			'server_protocol'	=> $request->variable('server_protocol', ''),
+			'server_name'	=> $request->variable('server_name', ''),
+			'server_port'	=> $request->variable('server_port', ''),
+			'script_path'	=> $request->variable('script_path', ''),
 		);
 	}