From 0e78996fdbc89e22225dd0a68c65229c7c6c355c Mon Sep 17 00:00:00 2001
From: Jakub Vrana <jakub@vrana.cz>
Date: Thu, 11 Sep 2014 08:48:17 -0700
Subject: [PATCH] Specify encoding for PHP 5.6 with invalid default_charset
 (fixes #421)

---
 adminer/include/functions.inc.php | 2 +-
 changes.txt                       | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
index a60eff99..251dfdfe 100644
--- 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", "&#0;", htmlspecialchars($string, ENT_QUOTES));
+	return str_replace("\0", "&#0;", htmlspecialchars($string, ENT_QUOTES, 'utf-8'));
 }
 
 /** Escape for TD
diff --git a/changes.txt b/changes.txt
index be606679..07667b2d 100644
--- 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)