aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2013-05-17 02:32:23 +0200
committerAndreas Fischer <bantu@phpbb.com>2013-05-17 02:32:23 +0200
commit1c1452d758240b98ed711311c408993da0569895 (patch)
treeca9777102f51ce07666ce62244315723717f024d
parent2961994f169f7bc94c0e853997762c80ac4f6b5b (diff)
parent0a1ca4d3eafda2e9c3baa30e55d825d934f5aed4 (diff)
downloadforums-1c1452d758240b98ed711311c408993da0569895.tar
forums-1c1452d758240b98ed711311c408993da0569895.tar.gz
forums-1c1452d758240b98ed711311c408993da0569895.tar.bz2
forums-1c1452d758240b98ed711311c408993da0569895.tar.xz
forums-1c1452d758240b98ed711311c408993da0569895.zip
Merge remote-tracking branch 'bantu/ticket/11547-develop' into develop
* bantu/ticket/11547-develop: [ticket/11547] Add phpbb_db_driver_ prefix to DBMS names.
-rw-r--r--tests/test_framework/phpbb_database_test_connection_manager.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/test_framework/phpbb_database_test_connection_manager.php b/tests/test_framework/phpbb_database_test_connection_manager.php
index 237fbd9af2..a192d2922f 100644
--- a/tests/test_framework/phpbb_database_test_connection_manager.php
+++ b/tests/test_framework/phpbb_database_test_connection_manager.php
@@ -145,8 +145,8 @@ class phpbb_database_test_connection_manager
switch ($this->config['dbms'])
{
- case 'mysql':
- case 'mysqli':
+ case 'phpbb_db_driver_mysql':
+ case 'phpbb_db_driver_mysqli':
$this->pdo->exec('SET NAMES utf8');
default:
}