gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3

Browse Source
This commit is contained in:
Weblate 2015-01-01 16:44:21 +01:00
commit bd7a3eabec
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -8,6 +8,7 @@ phpMyAdmin - ChangeLog
- bug #4679 Setup does not allow providing a name for favorites table
- bug #4680 Number of favorite table are not configurable in setup
- bug #4681 'Central columns table' field in setup does not have a description
- bug #4318 Default connection collation and sorting
--- Older ChangeLogs can be found on our project website ---
http://www.phpmyadmin.net/old-stuff/ChangeLogs/

2
libraries/config.default.php
View File

@ -2417,7 +2417,7 @@ $cfg['DefaultLang'] = 'en';
*
* @global string $cfg['DefaultConnectionCollation']
*/
$cfg['DefaultConnectionCollation'] = 'utf8_general_ci';
$cfg['DefaultConnectionCollation'] = 'utf8_unicode_ci';
/**
* Force: always use this language