[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0-461-gc74fad4

[Marc Delisle]

The branch, master has been updated
       via  c74fad43c4fb56c2e85aebc8ab036005d48d64df (commit)
       via  71a533536b0b9b34e3bcf89bb9710006b7cd5d03 (commit)
      from  cc639dec22e6e596f0cae4f28442233cd4f51ccc (commit)


- Log -----------------------------------------------------------------
commit c74fad43c4fb56c2e85aebc8ab036005d48d64df
Merge: cc639dec22e6e596f0cae4f28442233cd4f51ccc 71a533536b0b9b34e3bcf89bb9710006b7cd5d03
Author: Marc Delisle <marc at infomarc.info>
Date:   Mon May 16 12:53:25 2011 -0400

    Merge branch 'QA_3_4'

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

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

diff --git a/ChangeLog b/ChangeLog
index 3492cd5..6d5d013 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,7 @@
 - Patch #3302313 Show a translated label
 - bug #3300981 [navi] Table filter is case sensitive
 - bug #3285929 [privileges] Revert temporary fix
+- bug #3302872 [synchronize] Synchronize and user name
 
 3.4.0.0 (2011-05-11)
 + rfe #2890226 [view] Enable VIEW rename 
diff --git a/server_synchronize.php b/server_synchronize.php
index d097059..fa3a959 100644
--- a/server_synchronize.php
+++ b/server_synchronize.php
@@ -1184,7 +1184,7 @@ if (isset($_REQUEST['synchronize_db'])) {
 	</tr>
 	<tr class="odd toggler remote-server">
 	    <td><?php echo __('User name'); ?></td>
-        <td><input type="text" name="<?php echo $type; ?>_username" class="server-user" <?php echo $possibly_readonly; ?>/></td>
+        <td><input type="text" name="<?php echo $type; ?>_username" class="server-user" /></td>
 	</tr>
 	<tr class="even toggler remote-server">
 	    <td><?php echo __('Password'); ?></td>


hooks/post-receive
-- 
phpMyAdmin