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

Merge branch '3.3.x'

Browse Source
This commit is contained in:
Marc Alexander
2020-11-22 22:03:06 +01:00
parent 54611c94aa 5a55891d06
commit c11f9bbe0d
2 changed files with 141 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
phpBB/phpbb/di/container_builder.php
View File

@@ -116,6 +116,11 @@ class container_builder
/** @var \Exception */
private $build_exception;
/**
* @var array
*/
private $env_parameters = [];
/**
* Constructor
*
@@ -124,8 +129,14 @@ class container_builder
*/
public function __construct($phpbb_root_path, $php_ext)
{
$this->phpbb_root_path = $phpbb_root_path;
$this->php_ext = $php_ext;
$this->phpbb_root_path = $phpbb_root_path;
$this->php_ext = $php_ext;
$this->env_parameters = $this->get_env_parameters();
if (isset($this->env_parameters['core.cache_dir']))
{
$this->with_cache_dir($this->env_parameters['core.cache_dir']);
}
}
/**
@@ -586,14 +597,14 @@ class container_builder
protected function get_core_parameters()
{
return array_merge(
array(
[
'core.root_path' => $this->phpbb_root_path,
'core.php_ext' => $this->php_ext,
'core.environment' => $this->get_environment(),
'core.debug' => defined('DEBUG') ? DEBUG : false,
'core.cache_dir' => $this->get_cache_dir(),
),
$this->get_env_parameters()
],
$this->env_parameters
);
}