mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

[ticket/12620] Use the container to get the environment name

Browse Source 
PHPBB3-12620
This commit is contained in:
Tristan Darricau
2014-11-11 17:59:41 +01:00
parent c98efc53a8
commit acc91a2bbf
4 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
phpBB/includes/functions_url_matcher.php
View File

@@ -35,7 +35,9 @@ if (!defined('IN_PHPBB'))
*/
function phpbb_get_url_matcher(\phpbb\extension\manager $manager, RequestContext $context, $root_path, $php_ext)
{
$config_cache = new ConfigCache($root_path . 'cache/' . PHPBB_ENVIRONMENT . '/url_matcher.' . $php_ext, defined('DEBUG'));
global $phpbb_container;
$config_cache = new ConfigCache($root_path . 'cache/' . $phpbb_container->getParameter('core.environment') . '/url_matcher.' . $php_ext, defined('DEBUG'));
if (!$config_cache->isFresh())
{
phpbb_create_dumped_url_matcher($manager, $root_path, $config_cache);
@@ -90,6 +92,8 @@ function phpbb_create_url_matcher(\phpbb\extension\manager $manager, RequestCont
*/
function phpbb_load_url_matcher(RequestContext $context, $root_path, $php_ext)
{
require($root_path . 'cache/' . PHPBB_ENVIRONMENT . '/url_matcher.' . $php_ext);
global $phpbb_container;
require($root_path . 'cache/' . $phpbb_container->getParameter('core.environment') . '/url_matcher.' . $php_ext);
return new phpbb_url_matcher($context);
}