makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.2.x'

Browse source
This commit is contained in:
Marc Alexander 2016-08-21 18:57:37 +02:00
commit 229816ebe8
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/includes/compatibility_globals.php
View file

@ -49,6 +49,8 @@ function register_compatibility_globals()
/* @var $request \phpbb\request\request_interface */ /* @var $request \phpbb\request\request_interface */
$request = $phpbb_container->get('request'); $request = $phpbb_container->get('request');
// Inject request instance, so only this instance is used with request_var
request_var('', 0, false, false, $request);
/* @var $user \phpbb\user */ /* @var $user \phpbb\user */
$user = $phpbb_container->get('user'); $user = $phpbb_container->get('user');
@ -62,6 +64,8 @@ function register_compatibility_globals()
// Grab global variables, re-cache if necessary // Grab global variables, re-cache if necessary
/* @var $config phpbb\config\db */ /* @var $config phpbb\config\db */
$config = $phpbb_container->get('config'); $config = $phpbb_container->get('config');
set_config('', '', false, $config);
set_config_count('', 0, false, $config);
/* @var $phpbb_log \phpbb\log\log_interface */ /* @var $phpbb_log \phpbb\log\log_interface */
$phpbb_log = $phpbb_container->get('log'); $phpbb_log = $phpbb_container->get('log');