diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-06-29 21:47:00 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-07-07 01:02:39 +0200 |
| commit | 98e8be966bd8174c2a3f4e8fb80167b23573441f (patch) | |
| tree | 17dc10b94c5b994f1b2cc1ce5f6b5259ec6b1e63 /phpBB/phpbb/di | |
| parent | 15c23e60b8e4b78c68286ae76e03a12b81393159 (diff) | |
| download | forums-98e8be966bd8174c2a3f4e8fb80167b23573441f.tar forums-98e8be966bd8174c2a3f4e8fb80167b23573441f.tar.gz forums-98e8be966bd8174c2a3f4e8fb80167b23573441f.tar.bz2 forums-98e8be966bd8174c2a3f4e8fb80167b23573441f.tar.xz forums-98e8be966bd8174c2a3f4e8fb80167b23573441f.zip | |
[ticket/12775] Fix comments
PHPBB3-12775
Diffstat (limited to 'phpBB/phpbb/di')
| -rw-r--r-- | phpBB/phpbb/di/container_builder.php | 1 | ||||
| -rw-r--r-- | phpBB/phpbb/di/extension/config.php | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/phpBB/phpbb/di/container_builder.php b/phpBB/phpbb/di/container_builder.php index f78b9e60f8..fbbe736e47 100644 --- a/phpBB/phpbb/di/container_builder.php +++ b/phpBB/phpbb/di/container_builder.php @@ -273,7 +273,6 @@ class container_builder */ protected function dump_container($container_filename) { - // Lastly, we create our cached container class $dumper = new PhpDumper($this->container); $cached_container_dump = $dumper->dump(array( 'class' => 'phpbb_cache_container', diff --git a/phpBB/phpbb/di/extension/config.php b/phpBB/phpbb/di/extension/config.php index 4176df9227..ec2d7f6e44 100644 --- a/phpBB/phpbb/di/extension/config.php +++ b/phpBB/phpbb/di/extension/config.php @@ -39,7 +39,7 @@ class config extends Extension */ public function load(array $config, ContainerBuilder $container) { - $container->setParameter('core.adm_relative_path', (isset($phpbb_adm_relative_path) ? $phpbb_adm_relative_path : 'adm/')); + $container->setParameter('core.adm_relative_path', ($this->config_php->get('phpbb_adm_relative_path') ? $this->config_php->get('phpbb_adm_relative_path') : 'adm/')); $container->setParameter('core.table_prefix', $this->config_php->get('table_prefix')); $container->setParameter('cache.driver.class', $this->convert_30_acm_type($this->config_php->get('acm_type'))); $container->setParameter('dbal.driver.class', phpbb_convert_30_dbms_to_31($this->config_php->get('dbms'))); |