nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

better check for strings

Browse Source 
use no separator if requested, really
This commit is contained in:
Sebastian Mendel
2007-10-17 13:10:39 +00:00
parent 085a7c8f22
commit a726763bda
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libraries/Message.class.php
View File

@@ -468,7 +468,10 @@ class PMA_Message
*/ */
public function addMessage($message, $separator = ' ') public function addMessage($message, $separator = ' ')
{ {
$this->_added_messages[] = $separator; if (strlen($separator)) {
$this->_added_messages[] = $separator;
}
if ($message instanceof PMA_Message) { if ($message instanceof PMA_Message) {
$this->_added_messages[] = $message; $this->_added_messages[] = $message;
} else { } else {
@@ -666,7 +669,14 @@ class PMA_Message
$message = $this->_message; $message = $this->_message;
if (0 === strlen($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) { if (count($this->getParams()) > 0) {
@@ -676,7 +686,7 @@ class PMA_Message
$message = PMA_Message::decodeBB($message); $message = PMA_Message::decodeBB($message);
foreach ($this->getAddedMessages() as $add_message) { foreach ($this->getAddedMessages() as $add_message) {
$message .= ' ' . $add_message; $message .= $add_message;
} }
return $message; return $message;