diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-09-29 15:39:15 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-11-20 20:58:35 +0100 |
| commit | 998b4baa7197db8ac163cfbab97e1cd2eac761dc (patch) | |
| tree | 918246ec6e4bad93a868d075fa3d5b7885b18290 | |
| parent | 014eed385bf761d9e3f0992835f44f58bf055afd (diff) | |
| download | forums-998b4baa7197db8ac163cfbab97e1cd2eac761dc.tar forums-998b4baa7197db8ac163cfbab97e1cd2eac761dc.tar.gz forums-998b4baa7197db8ac163cfbab97e1cd2eac761dc.tar.bz2 forums-998b4baa7197db8ac163cfbab97e1cd2eac761dc.tar.xz forums-998b4baa7197db8ac163cfbab97e1cd2eac761dc.zip | |
[ticket/12620] Fix download/file.php and app.php outside of the root_path
PHPBB3-12620
| -rw-r--r-- | phpBB/download/file.php | 5 | ||||
| -rw-r--r-- | phpBB/includes/functions_url_matcher.php | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/phpBB/download/file.php b/phpBB/download/file.php index 77fb455bc1..4b8309c70e 100644 --- a/phpBB/download/file.php +++ b/phpBB/download/file.php @@ -42,6 +42,11 @@ if (isset($_GET['avatar'])) $phpbb_config_php_file = new \phpbb\config_php_file($phpbb_root_path, $phpEx); extract($phpbb_config_php_file->get_all()); + if (!defined('PHPBB_ENVIRONMENT')) + { + @define('PHPBB_ENVIRONMENT', 'production'); + } + if (!defined('PHPBB_INSTALLED') || empty($dbms) || empty($acm_type)) { exit; diff --git a/phpBB/includes/functions_url_matcher.php b/phpBB/includes/functions_url_matcher.php index 3d977a5daf..3bbc1cc924 100644 --- a/phpBB/includes/functions_url_matcher.php +++ b/phpBB/includes/functions_url_matcher.php @@ -57,9 +57,9 @@ 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 = new \phpbb\controller\provider($root_path); $provider->find_routing_files($manager->all_enabled()); - $routes = $provider->find($root_path)->get_routes(); + $routes = $provider->find()->get_routes(); $dumper = new PhpMatcherDumper($routes); $cached_url_matcher_dump = $dumper->dump(array( 'class' => 'phpbb_url_matcher', @@ -77,9 +77,9 @@ 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 = new \phpbb\controller\provider($root_path); $provider->find_routing_files($manager->all_enabled()); - $routes = $provider->find($root_path)->get_routes(); + $routes = $provider->find()->get_routes(); return new UrlMatcher($routes, $context); } |