Merge remote-tracking branch 'origin/master'

ChangeLog

@@ -31,6 +31,7 @@ phpMyAdmin - ChangeLog
 - 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
+- bug #3317293 [edit] Inline edit places HTML line breaks in edit area
 
 3.4.2.0 (2011-06-07)
 - bug #3301249 [interface] Iconic table operations does not remove inline edit label

js/sql.js

@@ -712,8 +712,10 @@ $(document).ready(function() {
             // and store the current value in a hidden span
             if($this_field.is(':not(.truncated, .transformed, .relation, .enum, .set, .null)')) {
                 // handle non-truncated, non-transformed, non-relation values
+
+                value = data_value.replace("<br>", "\n");
                 // We don't need to get any more data, just wrap the value
-                $this_field_span.append('<textarea>'+data_value+'</textarea>');
+                $this_field_span.append('<textarea>' + value + '</textarea>');
                 $this_field.data('original_data', data_value);
             }
             else if($this_field.is('.truncated, .transformed')) {