From 599f1d24551feaf940bb93011647c73cd44f1fc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Wed, 11 May 2016 11:39:10 +0200
Subject: [PATCH] Avoid parsing non JSON responses as JSON
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is just a changelog entry, real fix was in
d344a8f7ae54405f5a7a56ebc3158255cc36b95c.

Fixes #12240

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 ChangeLog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ChangeLog b/ChangeLog
index 05f99e204b..5de36b41a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@ phpMyAdmin - ChangeLog
 4.6.2 (not yet released)
 - issue #12225 Use https for documentation links
 - issue #12234 Fix schema export with too many tables
+- issue #12240 Avoid parsing non JSON responses as JSON
 
 4.6.1 (2016-05-02)
 - issue #12120 PMA_Util not found in insert_edit.lib.php