[ticket/11574] Use request object rather then request_var function

PHPBB3-11574
This commit is contained in:
Joas Schilling 2013-06-10 13:57:47 +02:00
parent deac5f53e3
commit 3eaeede321

View file

@ -127,7 +127,7 @@ $request = $phpbb_container->get('request');
request_var('', 0, false, false, $request); // "dependency injection" for a function request_var('', 0, false, false, $request); // "dependency injection" for a function
// Try and load an appropriate language if required // Try and load an appropriate language if required
$language = basename(request_var('language', '')); $language = basename($request->variable('language', ''));
if ($request->header('Accept-Language') && !$language) if ($request->header('Accept-Language') && !$language)
{ {
@ -212,8 +212,8 @@ define('CHMOD_READ', 4);
define('CHMOD_WRITE', 2); define('CHMOD_WRITE', 2);
define('CHMOD_EXECUTE', 1); define('CHMOD_EXECUTE', 1);
$mode = request_var('mode', 'overview'); $mode = $request->variable('mode', 'overview');
$sub = request_var('sub', ''); $sub = $request->variable('sub', '');
// Set PHP error handler to ours // Set PHP error handler to ours
set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handler'); set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handler');