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

diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
index a60eff999b660992fe30bcb852268f2420e9858a..251dfdfecc04c7cd7b581886d147287a49bbd282 100644 (file)
--- a/adminer/include/functions.inc.php
+++ b/adminer/include/functions.inc.php
@@ -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

diff --git a/changes.txt b/changes.txt
index be6066795b18c84475088b600ded708de4a43fb2..07667b2d82986ad9f44550ae69214d7cb1acf380 100644 (file)
--- a/changes.txt
+++ b/changes.txt
@@ -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)