aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2016-08-21 18:57:33 +0200
committerMarc Alexander <admin@m-a-styles.de>2016-08-21 18:57:33 +0200
commit43762950bc5e5552e25e7946a58ef2fde733a28b (patch)
tree0e42f00bdc9e2f9d155847d908cd114b9f6fc99d /phpBB/includes
parentcd0ffc5de61c3ec437c07b734aa1373f6c2dbb70 (diff)
parentcd2649273b89b86243205070a160ffb08d9118df (diff)
downloadforums-43762950bc5e5552e25e7946a58ef2fde733a28b.tar
forums-43762950bc5e5552e25e7946a58ef2fde733a28b.tar.gz
forums-43762950bc5e5552e25e7946a58ef2fde733a28b.tar.bz2
forums-43762950bc5e5552e25e7946a58ef2fde733a28b.tar.xz
forums-43762950bc5e5552e25e7946a58ef2fde733a28b.zip
Merge pull request #4418 from Elsensee/ticket/14636
[ticket/14636] Restore BC with compatibility functions
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/compatibility_globals.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/phpBB/includes/compatibility_globals.php b/phpBB/includes/compatibility_globals.php
index dc7a593693..0f403896a7 100644
--- a/phpBB/includes/compatibility_globals.php
+++ b/phpBB/includes/compatibility_globals.php
@@ -42,6 +42,8 @@ function register_compatibility_globals()
/* @var $request \phpbb\request\request_interface */
$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 */
$user = $phpbb_container->get('user');
@@ -55,6 +57,8 @@ function register_compatibility_globals()
// Grab global variables, re-cache if necessary
/* @var $config phpbb\config\db */
$config = $phpbb_container->get('config');
+ set_config('', '', false, $config);
+ set_config_count('', 0, false, $config);
/* @var $phpbb_log \phpbb\log\log_interface */
$phpbb_log = $phpbb_container->get('log');