The branch, master has been updated via 4338b70d9fdec523d93af791ba34817431e20154 (commit) via 9d2269d297cdc04dfe19d29025afb28b87a83f66 (commit) from 51af35ee1409256c70ed2ea226dd984582ed830f (commit)

- Log ----------------------------------------------------------------- commit 4338b70d9fdec523d93af791ba34817431e20154 Merge: 51af35ee1409256c70ed2ea226dd984582ed830f 9d2269d297cdc04dfe19d29025afb28b87a83f66 Author: Madhura Jayaratne madhura.cj@gmail.com Date: Thu Jun 16 21:23:12 2011 +0530

Merge branch 'QA_3_4'

Conflicts: js/sql.js

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

Summary of changes: ChangeLog | 1 + js/sql.js | 4 +++- 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog index 042bf04..b69dd20 100644 --- a/ChangeLog +++ b/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 diff --git a/js/sql.js b/js/sql.js index dfe05da..bc252a5 100644 --- a/js/sql.js +++ b/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')) {

hooks/post-receive