[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2-3857-g51af35e

[Marc Delisle]

The branch, master has been updated
       via  51af35ee1409256c70ed2ea226dd984582ed830f (commit)
       via  99bae4acb9a94c93ca31c8d49eb9a771f34aad54 (commit)
      from  6f305d40814a5383e739f86a8f68ae19118c03bf (commit)


- Log -----------------------------------------------------------------
commit 51af35ee1409256c70ed2ea226dd984582ed830f
Merge: 6f305d40814a5383e739f86a8f68ae19118c03bf 99bae4acb9a94c93ca31c8d49eb9a771f34aad54
Author: Marc Delisle <marc at infomarc.info>
Date:   Thu Jun 16 07:57:54 2011 -0400

    Merge branch 'QA_3_4'

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

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

diff --git a/ChangeLog b/ChangeLog
index f30beea..042bf04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -30,6 +30,7 @@ phpMyAdmin - ChangeLog
 - patch #3313326 [interface] Some tooltips do not disappear
 - bug #3315720 [search] Fix search in non unicode tables
 - bug #3315741 [display] Inline query edit broken
+- patch #3317206 [privileges] Generate password option missing on new accounts
 
 3.4.2.0 (2011-06-07)
 - bug #3301249 [interface] Iconic table operations does not remove inline edit label
diff --git a/server_privileges.php b/server_privileges.php
index b5f7031..cedbcef 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -1698,7 +1698,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
 
                 unset ($row);
                 echo '    <fieldset id="fieldset_add_user">' . "\n"
-                   . '        <a href="server_privileges.php?' . $GLOBALS['url_query'] . '&adduser=1">' . "\n"
+                   . '        <a href="server_privileges.php?' . $GLOBALS['url_query'] . '&adduser=1" class="' . $conditional_class . '">' . "\n"
                    . PMA_getIcon('b_usradd.png')
                    . '            ' . __('Add user') . '</a>' . "\n"
                    . '    </fieldset>' . "\n";


hooks/post-receive
-- 
phpMyAdmin