From 0caecf5fc894db9d904fe1e62d05888edd664038 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Mon, 13 Jun 2016 12:46:29 +0200
Subject: [PATCH] Correct error handling when editing variable fails
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Issue #12317

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 js/server_variables.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/js/server_variables.js b/js/server_variables.js
index 5ee04a478d..ef92a8fed5 100644
--- a/js/server_variables.js
+++ b/js/server_variables.js
@@ -100,7 +100,11 @@ AJAX.registerOnload('server_variables.js', function () {
                             .data('content', data.variable);
                         PMA_ajaxRemoveMessage($msgbox);
                     } else {
-                        PMA_ajaxShowMessage(data.error, false);
+                        if (data.error == '') {
+                            PMA_ajaxShowMessage(PMA_messages.strRequestFailed, false);
+                        } else {
+                            PMA_ajaxShowMessage(data.error, false);
+                        }
                         $valueCell.html($valueCell.data('content'));
                     }
                     $cell.removeClass('edit').html($myEditLink);