diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2012-11-16 01:48:03 +0100 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2012-11-16 01:48:03 +0100 |
| commit | fc5385c2a58833af2929c75d132903a3a0918da9 (patch) | |
| tree | f1b5adead2d8c86594aa399e21170dfc78466463 | |
| parent | 0d4a289778893d44288d9f586852038f6b52d4db (diff) | |
| download | forums-fc5385c2a58833af2929c75d132903a3a0918da9.tar forums-fc5385c2a58833af2929c75d132903a3a0918da9.tar.gz forums-fc5385c2a58833af2929c75d132903a3a0918da9.tar.bz2 forums-fc5385c2a58833af2929c75d132903a3a0918da9.tar.xz forums-fc5385c2a58833af2929c75d132903a3a0918da9.zip | |
[ticket/11015] Allow full dbms class name in config.php
PHPBB3-11015
| -rw-r--r-- | phpBB/includes/di/extension/config.php | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/phpBB/includes/di/extension/config.php b/phpBB/includes/di/extension/config.php index 5b2df93ff2..85ab7ab28d 100644 --- a/phpBB/includes/di/extension/config.php +++ b/phpBB/includes/di/extension/config.php @@ -43,8 +43,8 @@ class phpbb_di_extension_config extends Extension require($this->config_file); $container->setParameter('core.table_prefix', $table_prefix); - $container->setParameter('cache.driver.class', $this->fix_acm_type($acm_type)); - $container->setParameter('dbal.driver.class', 'phpbb_db_driver_'.$dbms); + $container->setParameter('cache.driver.class', $this->convert_30_acm_type($acm_type)); + $container->setParameter('dbal.driver.class', $this->convert_30_dbms($dbms)); $container->setParameter('dbal.dbhost', $dbhost); $container->setParameter('dbal.dbuser', $dbuser); $container->setParameter('dbal.dbpasswd', $dbpasswd); @@ -66,12 +66,12 @@ class phpbb_di_extension_config extends Extension } /** - * Convert old (3.0) values to 3.1 class names + * Convert 3.0 ACM type to 3.1 cache driver class name * - * @param style $acm_type ACM type - * @return ACM type class + * @param string $acm_type ACM type + * @return cache driver class */ - protected function fix_acm_type($acm_type) + protected function convert_30_acm_type($acm_type) { if (preg_match('#^[a-z]+$#', $acm_type)) { @@ -80,4 +80,20 @@ class phpbb_di_extension_config extends Extension return $acm_type; } + + /** + * Convert 3.0 dbms to 3.1 db driver class name + * + * @param string $dbms dbms parameter + * @return db driver class + */ + protected function convert_30_dbms($dbms) + { + if (!preg_match('#^phpbb_db_driver_#', $dbms)) + { + return 'phpbb_db_driver_'.$dbms; + } + + return $dbms; + } } |