From a726763bdad40fb9422af13efccae8184182a166 Mon Sep 17 00:00:00 2001
From: Sebastian Mendel <cybot_tm@users.sourceforge.net>
Date: Wed, 17 Oct 2007 13:10:39 +0000
Subject: [PATCH] better check for strings use no separator if requested,
 really

---
 libraries/Message.class.php | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/libraries/Message.class.php b/libraries/Message.class.php
index d7aa057f1..c37ba9cf2 100644
--- a/libraries/Message.class.php
+++ b/libraries/Message.class.php
@@ -468,7 +468,10 @@ class PMA_Message
      */
     public function addMessage($message, $separator = ' ')
     {
-        $this->_added_messages[] = $separator;
+        if (strlen($separator)) {
+            $this->_added_messages[] = $separator;
+        }
+
         if ($message instanceof PMA_Message) {
             $this->_added_messages[] = $message;
         } else {
@@ -666,7 +669,14 @@ class PMA_Message
         $message = $this->_message;
 
         if (0 === strlen($message)) {
-            $message = $GLOBALS[$this->getString()];
+            $string = $this->getString();
+            if (isset($GLOBALS[$string])) {
+                $message = $GLOBALS[$string];
+            } elseif (0 === strlen($string)) {
+                $message = '';
+            } else {
+                $message = $string;
+            }
         }
 
         if (count($this->getParams()) > 0) {
@@ -676,7 +686,7 @@ class PMA_Message
         $message = PMA_Message::decodeBB($message);
 
         foreach ($this->getAddedMessages() as $add_message) {
-            $message .= ' ' . $add_message;
+            $message .= $add_message;
         }
 
         return $message;