diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-05-02 19:16:52 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-05-02 19:16:52 +0200 |
| commit | b73d0bdbd671f8a301fda52584bfeaf904551e2d (patch) | |
| tree | 9e0f7399701a45fc127deb19ef8d3f7c726481ac /phpBB/common.php | |
| parent | c609c57035969fccfe72b7ff584a74b0631d64c5 (diff) | |
| parent | 99a932e0f93a6777fa78ca50a6cfff3d692515c8 (diff) | |
| download | forums-b73d0bdbd671f8a301fda52584bfeaf904551e2d.tar forums-b73d0bdbd671f8a301fda52584bfeaf904551e2d.tar.gz forums-b73d0bdbd671f8a301fda52584bfeaf904551e2d.tar.bz2 forums-b73d0bdbd671f8a301fda52584bfeaf904551e2d.tar.xz forums-b73d0bdbd671f8a301fda52584bfeaf904551e2d.zip | |
Merge remote-tracking branch 'github-bantu/ticket/12473' into develop-ascraeus
* github-bantu/ticket/12473:
[ticket/12473] Add console command for database migration.
[ticket/12473] Add more compatibility to phpBB Console Application.
[ticket/12473] Move compatibility globals out into its own file.
Diffstat (limited to 'phpBB/common.php')
| -rw-r--r-- | phpBB/common.php | 29 |
1 files changed, 1 insertions, 28 deletions
diff --git a/phpBB/common.php b/phpBB/common.php index 12dbe5a62c..4ad669a021 100644 --- a/phpBB/common.php +++ b/phpBB/common.php @@ -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_ext->set_cache($phpbb_container->get('cache.driver')); -// 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'); +require($phpbb_root_path . 'includes/compatibility_globals.' . $phpEx); // Add own hook handler require($phpbb_root_path . 'includes/hooks/index.' . $phpEx); |