Fixed displaying of SQL query on table operations

- do not show message about executed SQL when none was executed
- always show the SQL

Signed-off-by: Michal Čihař <michal@cihar.com>

1 files changed, 26 insertions, 14 deletions

diff --git a/tbl_operations.php b/tbl_operations.php
index 66e36392c9..3dcd5b534c 100644
--- a/tbl_operations.php
+++ b/tbl_operations.php
@@ -197,8 +197,6 @@ if (isset($_REQUEST['submitorderby']) && ! empty($_REQUEST['order_field'])) {
 /**
  * A partition operation has been requested by the user
  */
-$sql_query = '';
-
 if (isset($_REQUEST['submit_partition'])
     && ! empty($_REQUEST['partition_operation'])
 ) {
@@ -216,9 +214,13 @@ unset($reread_info);
 
 if (isset($result) && empty($message_to_show)) {
     if (empty($_message)) {
-        $_message = $result
-            ? PMA\libraries\Message::success()
-            : PMA\libraries\Message::error();
+        if (empty($sql_query)) {
+            $_message = PMA\libraries\Message::success(__('No change'));
+        } else {
+            $_message = $result
+                ? PMA\libraries\Message::success()
+                : PMA\libraries\Message::error();
+        }
 
         if (isset($GLOBALS['ajax_request'])
             && $GLOBALS['ajax_request'] == true
@@ -226,9 +228,11 @@ if (isset($result) && empty($message_to_show)) {
             $response = PMA\libraries\Response::getInstance();
             $response->setRequestStatus($_message->isSuccess());
             $response->addJSON('message', $_message);
-            $response->addJSON(
-                'sql_query', PMA\libraries\Util::getMessage(null, $sql_query)
-            );
+            if (!empty($sql_query)) {
+                $response->addJSON(
+                    'sql_query', PMA\libraries\Util::getMessage(null, $sql_query)
+                );
+            }
             exit;
         }
     }
@@ -242,17 +246,25 @@ if (isset($result) && empty($message_to_show)) {
             $response = PMA\libraries\Response::getInstance();
             $response->setRequestStatus(false);
             $response->addJSON('message', $_message);
-            $response->addJSON(
-                'sql_query', PMA\libraries\Util::getMessage(null, $sql_query)
-            );
+            if (!empty($sql_query)) {
+                $response->addJSON(
+                    'sql_query', PMA\libraries\Util::getMessage(null, $sql_query)
+                );
+            }
             exit;
         }
         unset($warning_messages);
     }
 
-    $response->addHTML(
-        PMA\libraries\Util::getMessage($_message, $sql_query)
-    );
+    if (empty($sql_query)) {
+        $response->addHTML(
+            $_message->getDisplay()
+        );
+    } else {
+        $response->addHTML(
+            PMA\libraries\Util::getMessage($_message, $sql_query)
+        );
+    }
     unset($_message);
 }