aboutsummaryrefslogtreecommitdiffstats
path: root/tests/test_framework/phpbb_database_test_connection_manager.php
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2013-05-17 02:27:25 +0200
committerAndreas Fischer <bantu@phpbb.com>2013-05-17 02:27:25 +0200
commit2961994f169f7bc94c0e853997762c80ac4f6b5b (patch)
tree3db08d1cd42855e8ee2f663a6b42ebf94499de4b /tests/test_framework/phpbb_database_test_connection_manager.php
parentd969203158ce3694c4baf20b221dd6dc2e3aae6b (diff)
parent37a334c187e382fcbaee717bc3df91ef9ce82e10 (diff)
downloadforums-2961994f169f7bc94c0e853997762c80ac4f6b5b.tar
forums-2961994f169f7bc94c0e853997762c80ac4f6b5b.tar.gz
forums-2961994f169f7bc94c0e853997762c80ac4f6b5b.tar.bz2
forums-2961994f169f7bc94c0e853997762c80ac4f6b5b.tar.xz
forums-2961994f169f7bc94c0e853997762c80ac4f6b5b.zip
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/11542] Use Czech as example as it contains non-latin characters [ticket/11547] Set MySQL charset to UTF8 in database_test_connection_manager.
Diffstat (limited to 'tests/test_framework/phpbb_database_test_connection_manager.php')
-rw-r--r--tests/test_framework/phpbb_database_test_connection_manager.php8
1 files changed, 8 insertions, 0 deletions
diff --git a/tests/test_framework/phpbb_database_test_connection_manager.php b/tests/test_framework/phpbb_database_test_connection_manager.php
index 29058cc815..237fbd9af2 100644
--- a/tests/test_framework/phpbb_database_test_connection_manager.php
+++ b/tests/test_framework/phpbb_database_test_connection_manager.php
@@ -142,6 +142,14 @@ class phpbb_database_test_connection_manager
}
$this->pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+
+ switch ($this->config['dbms'])
+ {
+ case 'mysql':
+ case 'mysqli':
+ $this->pdo->exec('SET NAMES utf8');
+ default:
+ }
}
/**