Merge branch 'master' into OpenGIS

1 files changed, 3 insertions, 7 deletions

diff --git a/tbl_replace.php b/tbl_replace.php
index 8fd8197280..460908e350 100644
--- a/tbl_replace.php
+++ b/tbl_replace.php
@@ -381,7 +381,7 @@ foreach ($query as $single_query) {
     }
 
     if (! $result) {
-        $error_messages[] = PMA_DBI_getError();
+        $error_messages[] = PMA_Message::sanitize(PMA_DBI_getError());
     } else {
         // The next line contains a real assignment, it's not a typo
         if ($tmp = @PMA_DBI_affected_rows()) {
@@ -405,8 +405,8 @@ foreach ($query as $single_query) {
     } // end if
 
     foreach (PMA_DBI_get_warnings() as $warning) {
-        $warning_messages[] = $warning['Level'] . ': #' . $warning['Code']
-            . ' ' . $warning['Message'];
+        $warning_messages[] = PMA_Message::sanitize($warning['Level'] . ': #' . $warning['Code']
+            . ' ' . $warning['Message']);
     }
 
     unset($result);
@@ -422,10 +422,6 @@ if ($is_insert && count($value_sets) > 0) {
 $message->addMessages($last_messages, '<br />');
 
 if (! empty($warning_messages)) {
-    /**
-     * @todo use a <div class="error"> in PMA_showMessage() for this part of
-     * the message
-     */
     $message->addMessages($warning_messages, '<br />');
     $message->isError(true);
 }