2 files changed, 7 insertions, 8 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 483f24f3e5..69f5f58563 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -66,11 +66,6 @@ require($phpbb_root_path . 'includes/template.' . $phpEx);
 require($phpbb_root_path . 'includes/session.' . $phpEx);
 require($phpbb_root_path . 'includes/auth.' . $phpEx);
 
-require($phpbb_root_path . 'includes/request/type_cast_helper_interface.' . $phpEx);
-require($phpbb_root_path . 'includes/request/type_cast_helper.' . $phpEx);
-require($phpbb_root_path . 'includes/request/deactivated_super_global.' . $phpEx);
-require($phpbb_root_path . 'includes/request/request_interface.' . $phpEx);
-require($phpbb_root_path . 'includes/request/request.' . $phpEx);
 require($phpbb_root_path . 'includes/functions.' . $phpEx);
 
 if (file_exists($phpbb_root_path . 'includes/functions_content.' . $phpEx))
@@ -97,9 +92,13 @@ else
 	define('STRIP', (get_magic_quotes_gpc()) ? true : false);
 }
 
-$request = new phpbb_request(new phpbb_type_cast_helper());
-$user = new user();
 $cache = new cache();
+
+$class_loader = new phpbb_class_loader($phpbb_root_path, '.' . $phpEx, $cache);
+$class_loader->register();
+
+$request = new phpbb_request();
+$user = new user();
 $db = new $sql_db();
 
 // make sure request_var uses this request instance
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index 5862e2e8d2..50f0a049f2 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -172,7 +172,7 @@ require($phpbb_root_path . 'includes/functions_install.' . $phpEx);
 $class_loader = new phpbb_class_loader($phpbb_root_path, '.' . $phpEx);
 $class_loader->register();
 
-$request = new phpbb_request(new phpbb_type_cast_helper());
+$request = new phpbb_request();
 
 // make sure request_var uses this request instance
 request_var('', 0, false, false, $request); // "dependency injection" for a function