makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-olympus' into develop

Browse source 
* 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.
This commit is contained in:
Andreas Fischer 2013-05-17 02:27:25 +02:00
commit 2961994f16
3 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tests/functions/fixtures/language_select.xml
View file

@ -13,9 +13,9 @@
</row> </row>
<row> <row>
<value>2</value> <value>2</value>
<value>de</value> <value>cs</value>
<value>Deutsch</value> <value>Čeština</value>
<value>German</value> <value>Czech</value>
</row> </row>
</table> </table>
</dataset> </dataset>

8
tests/functions/language_select_test.php
View file

@ -19,10 +19,10 @@ class phpbb_functions_language_select_test extends phpbb_database_test_case
static public function language_select_data() static public function language_select_data()
{ {
return array( return array(
array('', '<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="en" selected="selected">English</option><option value="de">Deutsch</option>'), array('en', '<option value="cs">Čeština</option><option value="en" selected="selected">English</option>'),
array('de', '<option value="en">English</option><option value="de" selected="selected">Deutsch</option>'), array('cs', '<option value="cs" selected="selected">Čeština</option><option value="en">English</option>'),
array('cs', '<option value="en">English</option><option value="de">Deutsch</option>'), array('de', '<option value="cs">Čeština</option><option value="en">English</option>'),
); );
} }

8
tests/test_framework/phpbb_database_test_connection_manager.php
View file

@ -142,6 +142,14 @@ class phpbb_database_test_connection_manager
} }
$this->pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); $this->pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
switch ($this->config['dbms'])
{
case 'mysql':
case 'mysqli':
$this->pdo->exec('SET NAMES utf8');
default:
}
} }
/** /**