diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-06-29 21:58:17 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-07-07 01:02:40 +0200 |
| commit | ed812a9dfb59b1eb83263adbaa52723ff826a791 (patch) | |
| tree | c75d2136fa2486fb994dbddb8b7fa88401237e44 /phpBB/phpbb/di | |
| parent | 98e8be966bd8174c2a3f4e8fb80167b23573441f (diff) | |
| download | forums-ed812a9dfb59b1eb83263adbaa52723ff826a791.tar forums-ed812a9dfb59b1eb83263adbaa52723ff826a791.tar.gz forums-ed812a9dfb59b1eb83263adbaa52723ff826a791.tar.bz2 forums-ed812a9dfb59b1eb83263adbaa52723ff826a791.tar.xz forums-ed812a9dfb59b1eb83263adbaa52723ff826a791.zip | |
[ticket/12775] Move phpbb_convert_30_dbms_to_31 into the config file class
PHPBB3-12775
Diffstat (limited to 'phpBB/phpbb/di')
| -rw-r--r-- | phpBB/phpbb/di/container_builder.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/di/extension/config.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/phpbb/di/container_builder.php b/phpBB/phpbb/di/container_builder.php index fbbe736e47..95b82b26c7 100644 --- a/phpBB/phpbb/di/container_builder.php +++ b/phpBB/phpbb/di/container_builder.php @@ -302,7 +302,7 @@ class container_builder { if ($this->dbal_connection === null) { - $dbal_driver_class = phpbb_convert_30_dbms_to_31($this->config_php_handler->get('dbms')); + $dbal_driver_class = $this->config_php_handler->convert_30_dbms_to_31($this->config_php_handler->get('dbms')); $this->dbal_connection = new $dbal_driver_class(); $this->dbal_connection->sql_connect( $this->config_php_handler->get('dbhost'), diff --git a/phpBB/phpbb/di/extension/config.php b/phpBB/phpbb/di/extension/config.php index ec2d7f6e44..27ebc94bae 100644 --- a/phpBB/phpbb/di/extension/config.php +++ b/phpBB/phpbb/di/extension/config.php @@ -42,7 +42,7 @@ class config extends Extension $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'))); + $container->setParameter('dbal.driver.class', $this->config_php->convert_30_dbms_to_31($this->config_php->get('dbms'))); $container->setParameter('dbal.dbhost', $this->config_php->get('dbhost')); $container->setParameter('dbal.dbuser', $this->config_php->get('dbuser')); $container->setParameter('dbal.dbpasswd', $this->config_php->get('dbpasswd')); |