From 6897a5df538ce5690ee637bc27e450fb514a52c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Fri, 17 Jun 2016 17:21:31 +0200
Subject: [PATCH] Fix messages handling
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The first two messages were not used at all, now we concatenate them
all.

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 view_operations.php | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/view_operations.php b/view_operations.php
index 2f3d77507f..e85a87a377 100644
--- a/view_operations.php
+++ b/view_operations.php
@@ -46,18 +46,19 @@ $reread_info = false;
 /**
  * Updates if required
  */
+$_message = new PMA\libraries\Message;
+$_type = 'success';
 if (isset($_REQUEST['submitoptions'])) {
-    $_message = '';
 
     if (isset($_REQUEST['new_name'])) {
         if ($pma_table->rename($_REQUEST['new_name'])) {
-            $_message .= $pma_table->getLastMessage();
+            $_message->addText($pma_table->getLastMessage());
             $result = true;
             $GLOBALS['table'] = $pma_table->getName();
             $reread_info = true;
             $reload = true;
         } else {
-            $_message .= $pma_table->getLastError();
+            $_message->addText($pma_table->getLastError());
             $result = false;
         }
     }
@@ -68,16 +69,18 @@ if (isset($_REQUEST['submitoptions'])) {
 if (isset($result)) {
     // set to success by default, because result set could be empty
     // (for example, a table rename)
-    $_type = 'success';
-    if (empty($_message)) {
-        $_message = $result
-            ? __('Your SQL query has been executed successfully.')
-            : __('Error');
+    if (empty($_message->getString())) {
+        if ($result) {
+            $_message->addText(
+                __('Your SQL query has been executed successfully.')
+            );
+        } else {
+            $_message->addText(__('Error'));
+        }
         // $result should exist, regardless of $_message
         $_type = $result ? 'success' : 'error';
     }
     if (! empty($warning_messages)) {
-        $_message = new PMA\libraries\Message;
         $_message->addMessagesString($warning_messages);
         $_message->isError(true);
         unset($warning_messages);
@@ -85,8 +88,8 @@ if (isset($result)) {
     echo PMA\libraries\Util::getMessage(
         $_message, $sql_query, $_type
     );
-    unset($_message, $_type);
 }
+unset($_message, $_type);
 
 $url_params['goto'] = 'view_operations.php';
 $url_params['back'] = 'view_operations.php';