The branch, master has been updated
via 16b0a64d0bef53c3f57fa6cf79191a7fb71fd175 (commit)
via 514697082675f054671f6af4aa27c0c4601fcce8 (commit)
via 97439c45f02508fc2fa54558c3d8cfc84146ffe8 (commit)
from 98226ff7237f22baea3b5b59a2fa3db46bd5b259 (commit)
- Log -----------------------------------------------------------------
commit 16b0a64d0bef53c3f57fa6cf79191a7fb71fd175
Merge: 98226ff 5146970
Author: Michal Čihař <[email protected]>
Date: Wed Aug 17 09:59:53 2011 +0200
Merge branch 'QA_3_4'
-----------------------------------------------------------------------
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 08750e4..a14574a 100644
--- a/tbl_replace.php
+++ b/tbl_replace.php
@@ -350,7 +350,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()) {
@@ -374,8 +374,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);
@@ -391,10 +391,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
------------------------------------------------------------------------------
Get a FREE DOWNLOAD! and learn more about uberSVN rich system,
user administration capabilities and model configuration. Take
the hassle out of deploying and managing Subversion and the
tools developers use with it. http://p.sf.net/sfu/wandisco-d2d-2
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
