[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_1RC1-1806-g633f630

[Madhura Jayaratne]

The branch, master has been updated
       via  633f63004bfd3fd587dd8c164486dc302accafb2 (commit)
       via  f5eaf8c7d87e2c793f26127da20d25becf959ad8 (commit)
       via  16a28bbeaa9bc70a82891b5aac9a88d45987659b (commit)
      from  f64de0a3ead27c07b99231097bc226f8de4f9048 (commit)


- Log -----------------------------------------------------------------
commit 633f63004bfd3fd587dd8c164486dc302accafb2
Merge: f64de0a3ead27c07b99231097bc226f8de4f9048 f5eaf8c7d87e2c793f26127da20d25becf959ad8
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date:   Sun May 22 09:33:48 2011 +0530

    Merge branch 'QA_3_4'

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

Summary of changes:
 ChangeLog             |    1 +
 server_privileges.php |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d2da49e..b9650f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,7 @@
 - bug #3301249 [interface] Iconic table operations does not remove inline edit label
 - bug #3303869 [interface] Unnecessary scrolling on Databases page
 - patch #3303813 [setup] Define a label that was missing
+- bug #3305606 [interface] Show all button wraps on privileges page
 
 3.4.1.0 (2011-05-20)
 - bug #3301108 [interface] Synchronize and already configured host
diff --git a/server_privileges.php b/server_privileges.php
index 1407fdf..ec2f0a7 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -1159,7 +1159,7 @@ if (!empty($update_privs)) {
         $sql_query2 .= ';';
     }
     if (! PMA_DBI_try_query($sql_query0)) {
-        // This might fail when the executing user does not have ALL PRIVILEGES himself. 
+        // This might fail when the executing user does not have ALL PRIVILEGES himself.
         // See https://sourceforge.net/tracker/index.php?func=detail&aid=3285929&group_id=23067&atid=377408
         $sql_query0 = '';
     }
@@ -1580,7 +1580,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
                         echo '<td>' . $tmp_initial . '</td>';
                     }
                 }
-                echo '<td><a href="server_privileges.php?' . $GLOBALS['url_query'] . '&showall=1">[' . __('Show all') . ']</a></td>' . "\n";
+                echo '<td><a href="server_privileges.php?' . $GLOBALS['url_query'] . '&showall=1" class="nowrap">[' . __('Show all') . ']</a></td>' . "\n";
                 echo '</tr></table>';
             }
 


hooks/post-receive
-- 
phpMyAdmin