mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-08 04:18:52 +00:00
[ticket/12473] Move compatibility globals out into its own file.
PHPBB3-12473
This commit is contained in:
parent
a9ae1f83c7
commit
d798184d08
2 changed files with 45 additions and 28 deletions
|
@ -96,34 +96,7 @@ $phpbb_container = phpbb_create_default_container($phpbb_root_path, $phpEx);
|
||||||
$phpbb_class_loader->set_cache($phpbb_container->get('cache.driver'));
|
$phpbb_class_loader->set_cache($phpbb_container->get('cache.driver'));
|
||||||
$phpbb_class_loader_ext->set_cache($phpbb_container->get('cache.driver'));
|
$phpbb_class_loader_ext->set_cache($phpbb_container->get('cache.driver'));
|
||||||
|
|
||||||
// set up caching
|
require($phpbb_root_path . 'includes/compatibility_globals.' . $phpEx);
|
||||||
$cache = $phpbb_container->get('cache');
|
|
||||||
|
|
||||||
// Instantiate some basic classes
|
|
||||||
$phpbb_dispatcher = $phpbb_container->get('dispatcher');
|
|
||||||
$request = $phpbb_container->get('request');
|
|
||||||
$user = $phpbb_container->get('user');
|
|
||||||
$auth = $phpbb_container->get('auth');
|
|
||||||
$db = $phpbb_container->get('dbal.conn');
|
|
||||||
|
|
||||||
// make sure request_var uses this request instance
|
|
||||||
request_var('', 0, false, false, $request); // "dependency injection" for a function
|
|
||||||
|
|
||||||
// Grab global variables, re-cache if necessary
|
|
||||||
$config = $phpbb_container->get('config');
|
|
||||||
set_config(null, null, null, $config);
|
|
||||||
set_config_count(null, null, null, $config);
|
|
||||||
|
|
||||||
$phpbb_log = $phpbb_container->get('log');
|
|
||||||
$symfony_request = $phpbb_container->get('symfony_request');
|
|
||||||
$phpbb_filesystem = $phpbb_container->get('filesystem');
|
|
||||||
$phpbb_path_helper = $phpbb_container->get('path_helper');
|
|
||||||
|
|
||||||
// load extensions
|
|
||||||
$phpbb_extension_manager = $phpbb_container->get('ext.manager');
|
|
||||||
$phpbb_subscriber_loader = $phpbb_container->get('event.subscriber_loader');
|
|
||||||
|
|
||||||
$template = $phpbb_container->get('template');
|
|
||||||
|
|
||||||
// Add own hook handler
|
// Add own hook handler
|
||||||
require($phpbb_root_path . 'includes/hooks/index.' . $phpEx);
|
require($phpbb_root_path . 'includes/hooks/index.' . $phpEx);
|
||||||
|
|
44
phpBB/includes/compatibility_globals.php
Normal file
44
phpBB/includes/compatibility_globals.php
Normal file
|
@ -0,0 +1,44 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
* @package phpBB3
|
||||||
|
* @copyright (c) 2014 phpBB Group
|
||||||
|
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
*/
|
||||||
|
if (!defined('IN_PHPBB'))
|
||||||
|
{
|
||||||
|
exit;
|
||||||
|
}
|
||||||
|
|
||||||
|
// set up caching
|
||||||
|
$cache = $phpbb_container->get('cache');
|
||||||
|
|
||||||
|
// Instantiate some basic classes
|
||||||
|
$phpbb_dispatcher = $phpbb_container->get('dispatcher');
|
||||||
|
$request = $phpbb_container->get('request');
|
||||||
|
$user = $phpbb_container->get('user');
|
||||||
|
$auth = $phpbb_container->get('auth');
|
||||||
|
$db = $phpbb_container->get('dbal.conn');
|
||||||
|
|
||||||
|
// make sure request_var uses this request instance
|
||||||
|
request_var('', 0, false, false, $request); // "dependency injection" for a function
|
||||||
|
|
||||||
|
// Grab global variables, re-cache if necessary
|
||||||
|
$config = $phpbb_container->get('config');
|
||||||
|
set_config(null, null, null, $config);
|
||||||
|
set_config_count(null, null, null, $config);
|
||||||
|
|
||||||
|
$phpbb_log = $phpbb_container->get('log');
|
||||||
|
$symfony_request = $phpbb_container->get('symfony_request');
|
||||||
|
$phpbb_filesystem = $phpbb_container->get('filesystem');
|
||||||
|
$phpbb_path_helper = $phpbb_container->get('path_helper');
|
||||||
|
|
||||||
|
// load extensions
|
||||||
|
$phpbb_extension_manager = $phpbb_container->get('ext.manager');
|
||||||
|
$phpbb_subscriber_loader = $phpbb_container->get('event.subscriber_loader');
|
||||||
|
|
||||||
|
$template = $phpbb_container->get('template');
|
Loading…
Add table
Reference in a new issue