[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-1761-g419d067

[Marc Delisle]

The branch, master has been updated
       via  419d067dc348817c79386fba10cc1679df486729 (commit)
      from  10a4ec1fba6b1858a0e30d7e1dc4e7869a43b6b4 (commit)


- Log -----------------------------------------------------------------
commit 419d067dc348817c79386fba10cc1679df486729
Author: Marc Delisle <marc at infomarc.info>
Date:   Wed Mar 2 13:01:17 2011 -0500

    Extra line break generated when creating user via Ajax

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

Summary of changes:
 libraries/common.lib.php |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 4f8427b..2b7f738 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -1269,7 +1269,10 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
         echo $edit_link . $explain_link . $php_link . $refresh_link . $validate_link;
         echo '</div>';
     }
-    echo '</div><br class="clearfloat" />' . "\n";
+    echo '</div>';
+    if ($GLOBALS['is_ajax_request'] === false) {
+        echo '<br class="clearfloat" />';
+    }
 
     // If we are in an Ajax request, we have most probably been called in
     // PMA_ajaxResponse().  Hence, collect the buffer contents and return it


hooks/post-receive
-- 
phpMyAdmin