diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-09-05 16:33:57 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-11-20 20:15:45 +0100 |
| commit | 014eed385bf761d9e3f0992835f44f58bf055afd (patch) | |
| tree | 7c1e824a9346efd0dbe05c732926ae9fd006cd0b /phpBB | |
| parent | 7cd0fd83b8047f40edfb69a427b14997801ef25b (diff) | |
| download | forums-014eed385bf761d9e3f0992835f44f58bf055afd.tar forums-014eed385bf761d9e3f0992835f44f58bf055afd.tar.gz forums-014eed385bf761d9e3f0992835f44f58bf055afd.tar.bz2 forums-014eed385bf761d9e3f0992835f44f58bf055afd.tar.xz forums-014eed385bf761d9e3f0992835f44f58bf055afd.zip | |
[ticket/12620] Add support of the environments for the ext routing files
PHPBB3-12620
Diffstat (limited to 'phpBB')
| -rwxr-xr-x | phpBB/bin/phpbbcli.php | 6 | ||||
| -rw-r--r-- | phpBB/includes/functions_url_matcher.php | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/phpBB/bin/phpbbcli.php b/phpBB/bin/phpbbcli.php index ca425ad0c4..14681e25ee 100755 --- a/phpBB/bin/phpbbcli.php +++ b/phpBB/bin/phpbbcli.php @@ -21,6 +21,12 @@ if (php_sapi_name() != 'cli') } define('IN_PHPBB', true); + +if (!defined('PHPBB_ENVIRONMENT')) +{ + @define('PHPBB_ENVIRONMENT', 'production'); +} + $phpbb_root_path = __DIR__ . '/../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); require($phpbb_root_path . 'includes/startup.' . $phpEx); diff --git a/phpBB/includes/functions_url_matcher.php b/phpBB/includes/functions_url_matcher.php index b965046aad..3d977a5daf 100644 --- a/phpBB/includes/functions_url_matcher.php +++ b/phpBB/includes/functions_url_matcher.php @@ -58,7 +58,7 @@ function phpbb_get_url_matcher(\phpbb\extension\manager $manager, RequestContext function phpbb_create_dumped_url_matcher(\phpbb\extension\manager $manager, $root_path, $php_ext) { $provider = new \phpbb\controller\provider(); - $provider->find_routing_files($manager->get_finder()); + $provider->find_routing_files($manager->all_enabled()); $routes = $provider->find($root_path)->get_routes(); $dumper = new PhpMatcherDumper($routes); $cached_url_matcher_dump = $dumper->dump(array( @@ -78,7 +78,7 @@ function phpbb_create_dumped_url_matcher(\phpbb\extension\manager $manager, $roo function phpbb_create_url_matcher(\phpbb\extension\manager $manager, RequestContext $context, $root_path) { $provider = new \phpbb\controller\provider(); - $provider->find_routing_files($manager->get_finder()); + $provider->find_routing_files($manager->all_enabled()); $routes = $provider->find($root_path)->get_routes(); return new UrlMatcher($routes, $context); } |