The branch, master has been updated
via 808447af1ef9f117a7883ae0d1c8b56b366ba6c6 (commit)
via 11ad4fd992e51b86c127c95112ee313bdaaa9757 (commit)
from c326cfeec420ca94296b7708df52fd4cab0fc450 (commit)
- Log -----------------------------------------------------------------
commit 808447af1ef9f117a7883ae0d1c8b56b366ba6c6
Merge: c326cfeec420ca94296b7708df52fd4cab0fc450
11ad4fd992e51b86c127c95112ee313bdaaa9757
Author: Madhura Jayaratne <[email protected]>
Date: Fri Jul 29 06:39:58 2011 +0530
Merge branch 'QA_3_4'
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 1 +
libraries/footer.inc.php | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 9f3c162..319658a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -43,6 +43,7 @@ phpMyAdmin - ChangeLog
3.4.5.0 (not yet released)
- bug #3375325 [interface] Page list in navigation frame looks odd
+- bug #3313235 [interface] Error div misplaced
3.4.4.0 (not yet released)
- bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed
quotes
diff --git a/libraries/footer.inc.php b/libraries/footer.inc.php
index aa1af7a..dbb1f1a 100644
--- a/libraries/footer.inc.php
+++ b/libraries/footer.inc.php
@@ -31,7 +31,7 @@ if (! PMA_isValid($_REQUEST['no_history']) &&
empty($GLOBALS['error_message'])
}
if ($GLOBALS['error_handler']->hasDisplayErrors()) {
- echo '<div>';
+ echo '<div class="clearfloat">';
$GLOBALS['error_handler']->dispErrors();
echo '</div>';
}
hooks/post-receive
--
phpMyAdmin
------------------------------------------------------------------------------
Got Input? Slashdot Needs You.
Take our quick survey online. Come on, we don't ask for help often.
Plus, you'll get a chance to win $100 to spend on ThinkGeek.
http://p.sf.net/sfu/slashdot-survey
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
