mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 05:50:42 +02:00
Code Issues Releases Wiki Activity

[ticket/14957] Do not cache database config entries

Browse Source 
PHPBB3-14957
This commit is contained in:
Marc Alexander
2016-12-28 18:15:17 +01:00
parent bc96a9f1f6
commit 14fd750b08
6 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -185,6 +185,7 @@ class container_builder
}
$this->container->set('config.php', $this->config_php_file);
$this->inject_dbal_driver();
if ($this->compile_container)
{
@@ -303,6 +304,17 @@ class container_builder
}
}
/**
* Inject the dbal connection driver into container
*/
protected function inject_dbal_driver()
{
if (!empty($this->config_php_file->get_all()))
{
$this->container->set('dbal.conn.driver', $this->get_dbal_connection());
}
}
/**
* Get DB connection.
*
@@ -320,6 +332,7 @@ class container_builder
$this->config_php_file->get('dbpasswd'),
$this->config_php_file->get('dbname'),
$this->config_php_file->get('dbport'),
false,
defined('PHPBB_DB_NEW_LINK') && PHPBB_DB_NEW_LINK
);
}

6
phpBB/phpbb/di/extension/config.php
View File

@@ -43,12 +43,6 @@ class config extends Extension
'core.adm_relative_path' => $this->config_php->get('phpbb_adm_relative_path') ? $this->config_php->get('phpbb_adm_relative_path') : 'adm/',
'core.table_prefix' => $this->config_php->get('table_prefix'),
'cache.driver.class' => $this->convert_30_acm_type($this->config_php->get('acm_type')),
'dbal.driver.class' => $this->config_php->convert_30_dbms_to_31($this->config_php->get('dbms')),
'dbal.dbhost' => $this->config_php->get('dbhost'),
'dbal.dbuser' => $this->config_php->get('dbuser'),
'dbal.dbpasswd' => $this->config_php->get('dbpasswd'),
'dbal.dbname' => $this->config_php->get('dbname'),
'dbal.dbport' => $this->config_php->get('dbport'),
'dbal.new_link' => defined('PHPBB_DB_NEW_LINK') && PHPBB_DB_NEW_LINK,
);
$parameter_bag = $container->getParameterBag();