aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/bin/phpbbcli.php
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2014-05-02 19:16:52 +0200
committerNils Adermann <naderman@naderman.de>2014-05-02 19:16:52 +0200
commitb73d0bdbd671f8a301fda52584bfeaf904551e2d (patch)
tree9e0f7399701a45fc127deb19ef8d3f7c726481ac /phpBB/bin/phpbbcli.php
parentc609c57035969fccfe72b7ff584a74b0631d64c5 (diff)
parent99a932e0f93a6777fa78ca50a6cfff3d692515c8 (diff)
downloadforums-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/bin/phpbbcli.php')
-rwxr-xr-xphpBB/bin/phpbbcli.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/phpBB/bin/phpbbcli.php b/phpBB/bin/phpbbcli.php
index 49f4ca13e7..02d6b88943 100755
--- a/phpBB/bin/phpbbcli.php
+++ b/phpBB/bin/phpbbcli.php
@@ -22,6 +22,7 @@ require($phpbb_root_path . 'config.' . $phpEx);
require($phpbb_root_path . 'includes/constants.' . $phpEx);
require($phpbb_root_path . 'includes/functions.' . $phpEx);
require($phpbb_root_path . 'includes/functions_container.' . $phpEx);
+require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
require($phpbb_root_path . 'phpbb/class_loader.' . $phpEx);
$phpbb_class_loader = new \phpbb\class_loader('phpbb\\', "{$phpbb_root_path}phpbb/", $phpEx);
@@ -30,6 +31,8 @@ $phpbb_class_loader_ext = new \phpbb\class_loader('\\', "{$phpbb_root_path}ext/"
$phpbb_class_loader_ext->register();
$phpbb_container = phpbb_create_update_container($phpbb_root_path, $phpEx, "$phpbb_root_path/config");
+$phpbb_container->get('request')->enable_super_globals();
+require($phpbb_root_path . 'includes/compatibility_globals.' . $phpEx);
$application = new \phpbb\console\application('phpBB Console', PHPBB_VERSION);
$application->register_container_commands($phpbb_container);