Specify encoding for PHP 5.6 with invalid default_charset (fixes #421)

This commit is contained in:
Jakub Vrana 2014-09-11 08:48:17 -07:00
parent 8d432beb3d
commit 0e78996fdb
2 changed files with 3 additions and 1 deletions

View file

@ -78,7 +78,7 @@ function charset($connection) {
* @return string
*/
function h($string) {
return str_replace("\0", "�", htmlspecialchars($string, ENT_QUOTES));
return str_replace("\0", "�", htmlspecialchars($string, ENT_QUOTES, 'utf-8'));
}
/** Escape for TD

View file

@ -3,7 +3,9 @@ Fix reading routine column collations
Unlock session in alter database
Make master key unreadable to others (bug #410)
Fix edit by long non-utf8 string
Specify encoding for PHP 5.6 with invalid default_charset
MySQL: Use utf8mb4 if available
Elasticsearch: Use where in select
Danish translation
Adminer 4.1.0 (released 2014-04-18)