The branch, master has been updated via 1e0cff6161ba0fe675c47e94617b492fa155d089 (commit) via 7996a365756f08c2175d996e1fa9efd3829c4b96 (commit) from 82823d67feed46f061cab99c611b9561c174517f (commit)
- Log ----------------------------------------------------------------- commit 1e0cff6161ba0fe675c47e94617b492fa155d089 Merge: 82823d67feed46f061cab99c611b9561c174517f 7996a365756f08c2175d996e1fa9efd3829c4b96 Author: Marc Delisle marc@infomarc.info Date: Sun Jun 5 06:30:23 2011 -0400
Merge branch 'QA_3_4'
-----------------------------------------------------------------------
Summary of changes: ChangeLog | 1 + js/sql.js | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog index 5e054e1..54e05d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,7 @@ - patch #3304473 [setup] Redefine a lable that was wrong - bug #3304544 [parser] master is not a reserved word - bug #3307616 [edit] Inline edit updates multiple duplicate rows +- patch #3311539 [edit] Inline edit does not escape backslashes
3.4.2.0 (not yet released) - bug #3301249 [interface] Iconic table operations does not remove inline edit label diff --git a/js/sql.js b/js/sql.js index 8a76e68..a165e4a 100644 --- a/js/sql.js +++ b/js/sql.js @@ -944,6 +944,8 @@ $(document).ready(function() {
//Remove the last ',' appended in the above loop sql_query = sql_query.replace(/,\s$/, ''); + //Fix non-escaped backslashes + sql_query = sql_query.replace(/\/g, '\\'); new_clause = new_clause.substring(0, new_clause.length-5); new_clause = PMA_urlencode(new_clause); sql_query += ' WHERE ' + PMA_urldecode(where_clause);
hooks/post-receive