diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-05-17 02:27:25 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-05-17 02:27:25 +0200 |
| commit | 2961994f169f7bc94c0e853997762c80ac4f6b5b (patch) | |
| tree | 3db08d1cd42855e8ee2f663a6b42ebf94499de4b | |
| parent | d969203158ce3694c4baf20b221dd6dc2e3aae6b (diff) | |
| parent | 37a334c187e382fcbaee717bc3df91ef9ce82e10 (diff) | |
| download | forums-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.
| -rw-r--r-- | tests/functions/fixtures/language_select.xml | 6 | ||||
| -rw-r--r-- | tests/functions/language_select_test.php | 8 | ||||
| -rw-r--r-- | tests/test_framework/phpbb_database_test_connection_manager.php | 8 |
3 files changed, 15 insertions, 7 deletions
diff --git a/tests/functions/fixtures/language_select.xml b/tests/functions/fixtures/language_select.xml index 921f2c0a3a..d7232a3d28 100644 --- a/tests/functions/fixtures/language_select.xml +++ b/tests/functions/fixtures/language_select.xml @@ -13,9 +13,9 @@ </row> <row> <value>2</value> - <value>de</value> - <value>Deutsch</value> - <value>German</value> + <value>cs</value> + <value>Čeština</value> + <value>Czech</value> </row> </table> </dataset> diff --git a/tests/functions/language_select_test.php b/tests/functions/language_select_test.php index 3ec2bd4bc3..3341e2a256 100644 --- a/tests/functions/language_select_test.php +++ b/tests/functions/language_select_test.php @@ -19,10 +19,10 @@ class phpbb_functions_language_select_test extends phpbb_database_test_case static public function language_select_data() { return array( - array('', '<option value="en">English</option><option value="de">Deutsch</option>'), - array('en', '<option value="en" selected="selected">English</option><option value="de">Deutsch</option>'), - array('de', '<option value="en">English</option><option value="de" selected="selected">Deutsch</option>'), - array('cs', '<option value="en">English</option><option value="de">Deutsch</option>'), + array('', '<option value="cs">Čeština</option><option value="en">English</option>'), + array('en', '<option value="cs">Čeština</option><option value="en" selected="selected">English</option>'), + array('cs', '<option value="cs" selected="selected">Čeština</option><option value="en">English</option>'), + array('de', '<option value="cs">Čeština</option><option value="en">English</option>'), ); } 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: + } } /** |