No additional spaces in "(query took ...)" message

phpmyadmin · Apr 8, 2012 · 75393d9 · 75393d9
1 parent 4521b28
commit 75393d9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
@@ -2385,13 +2385,13 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql)
             $message->addMessage(', ', '');
         }
 
-        $messagge_qt = PMA_Message::notice(__('Query took %01.4f sec'));
+        $messagge_qt = PMA_Message::notice(__('Query took %01.4f sec') . ')');
         $messagge_qt->addParam($GLOBALS['querytime']);
 
         $message->addMessage($messagge_qt, '');
-        $message->addMessage(')', '');
-
-        $message->addMessage(isset($sorted_column_message) ? $sorted_column_message : '', '');
+        if (isset($sorted_column_message)) {
+            $message->addMessage($sorted_column_message : '', '');
+        }
 
         PMA_showMessage($message, $sql_query, 'success');
 

diff --git a/sql.php b/sql.php
@@ -763,11 +763,9 @@
     }
 
     if (isset($GLOBALS['querytime'])) {
-        $_querytime = PMA_Message::notice(__('Query took %01.4f sec'));
+        $_querytime = PMA_Message::notice('(' . __('Query took %01.4f sec') . ')');
         $_querytime->addParam($GLOBALS['querytime']);
-        $message->addMessage('(');
         $message->addMessage($_querytime);
-        $message->addMessage(')');
     }
 
     if ($GLOBALS['is_ajax_request'] == true) {