The branch, master has been updated
       via  0c391777536a07aaf490270d7431c4b40cdf44bd (commit)
       via  c759286fbe731cd0631b074d69faf0dfa9df0558 (commit)
      from  22f9ac76daceb370f468d6720462eb0e61903cf5 (commit)


- Log -----------------------------------------------------------------
commit 0c391777536a07aaf490270d7431c4b40cdf44bd
Author: Herman van Rink <[email protected]>
Date:   Mon Apr 25 13:51:02 2011 +0200

    add operations_full_width div to avoid overlapping boxes
    
    introduced in be14efaa75e99b821f862110a92e56c6b71d0c99

commit c759286fbe731cd0631b074d69faf0dfa9df0558
Author: Herman van Rink <[email protected]>
Date:   Mon Apr 25 12:34:37 2011 +0200

    Fixed comment typo

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

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

diff --git a/db_operations.php b/db_operations.php
index e49ddcb..5587664 100644
--- a/db_operations.php
+++ b/db_operations.php
@@ -569,7 +569,9 @@ echo __('Remove database');
         if (!empty($cfg['Servers'][$server]['pmadb'])) {
             $message->isError(true);
         }
+        echo '<div class="operations_full_width">';
         $message->display();
+        echo '</div>';
     } // end if
 } // end if (!$is_information_schema)
 
diff --git a/server_privileges.php b/server_privileges.php
index d497d71..02eb82a 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -179,7 +179,7 @@ function PMA_RangeOfUsers($initial = '')
  * @param   array   $row        the row
  * @param   boolean $enableHTML add <dfn> tag with tooltips
  *
- * @global  ressource $user_link the database connection
+ * @global  resource $user_link the database connection
  *
  * @return  array
  */


hooks/post-receive
-- 
phpMyAdmin

------------------------------------------------------------------------------
Fulfilling the Lean Software Promise
Lean software platforms are now widely adopted and the benefits have been 
demonstrated beyond question. Learn why your peers are replacing JEE 
containers with lightweight application servers - and what you can gain 
from the move. http://p.sf.net/sfu/vmware-sfemails
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git

Reply via email to