2 files changed, 5 insertions, 2 deletions
diff --git a/phpBB/style.php b/phpBB/style.php
index 026b5eecfc..368a7132e4 100644
--- a/phpBB/style.php
+++ b/phpBB/style.php
@@ -45,6 +45,7 @@ if (!empty($load_extensions) && function_exists('dl'))
 	}
 }
 
+// no $request here because it is not loaded yet
 $id = (isset($_GET['id'])) ? intval($_GET['id']) : 0;
 
 // This is a simple script to grab and output the requested CSS data stored in the DB
@@ -67,8 +68,12 @@ if ($id)
 	$class_loader = new phpbb_class_loader($phpbb_root_path, '.' . $phpEx, $cache);
 	$class_loader->register();
 
+	$request	= new phpbb_request();
 	$db = new $sql_db();
 
+	// make sure request_var uses this request instance
+	request_var('', 0, false, false, $request); // "dependency injection" for a function
+
 	// Connect to DB
 	if (!@$db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false, false))
 	{
diff --git a/phpBB/ucp.php b/phpBB/ucp.php
index f26f7b048e..2d190cb1a9 100644
--- a/phpBB/ucp.php
+++ b/phpBB/ucp.php
@@ -136,8 +136,6 @@ switch ($mode)
 
 	case 'delete_cookies':
 
-		global $request;
-
 		// Delete Cookies with dynamic names (do NOT delete poll cookies)
 		if (confirm_box(true))
 		{