[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_3_2-64-g5146970

[Michal Čihař]

The branch, QA_3_4 has been updated
       via  514697082675f054671f6af4aa27c0c4601fcce8 (commit)
       via  97439c45f02508fc2fa54558c3d8cfc84146ffe8 (commit)
      from  1d071050733e206f79a593b717ad77d412abda9a (commit)


- Log -----------------------------------------------------------------
commit 514697082675f054671f6af4aa27c0c4601fcce8
Author: Michal Čihař <michal at cihar.com>
Date:   Wed Aug 17 09:57:29 2011 +0200

    Escape displayed user input

commit 97439c45f02508fc2fa54558c3d8cfc84146ffe8
Author: Michal Čihař <michal at cihar.com>
Date:   Wed Aug 17 09:50:42 2011 +0200

    This is already done

-----------------------------------------------------------------------

Summary of changes:
 tbl_replace.php |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/tbl_replace.php b/tbl_replace.php
index 40d0ad4..f7cc17c 100644
--- a/tbl_replace.php
+++ b/tbl_replace.php
@@ -368,7 +368,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()) {
@@ -392,8 +392,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);
@@ -409,10 +409,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);
 }


hooks/post-receive
-- 
phpMyAdmin