[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_2-27-gada8916

[Rouslan Placella]

The branch, QA_3_4 has been updated
       via  ada8916b98d5a74e3bb4124e3d9dd417af69e007 (commit)
      from  b45de543c00b4eb39d9f67cb6d1c93f73f444863 (commit)


- Log -----------------------------------------------------------------
commit ada8916b98d5a74e3bb4124e3d9dd417af69e007
Author: Rouslan Placella <rouslan at placella.com>
Date:   Fri Jun 17 21:10:00 2011 +0100

    bug #3319466 [edit] Inline query edit does not escape special characters

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

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

diff --git a/ChangeLog b/ChangeLog
index cc6ce50..39fc645 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,7 @@ phpMyAdmin - ChangeLog
 - 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
+- bug #3319466 [interface] Inline query edit does not escape special characters
 
 3.4.2.0 (2011-06-07)
 - bug #3301249 [interface] Iconic table operations does not remove inline edit label
diff --git a/js/functions.js b/js/functions.js
index 35ec292..eea8573 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -1131,7 +1131,12 @@ $(document).ready(function(){
         $(".btnSave").each(function(){
             $(this).click(function(){
                 sql_query = $(this).prev().val();
-                window.location.replace("import.php?db=" + db +"&table=" + table + "&sql_query=" + sql_query + "&show_query=1&token=" + token);
+                window.location.replace("import.php"
+                                      + "?db=" + encodeURIComponent(db)
+                                      + "&table=" + encodeURIComponent(table)
+                                      + "&sql_query=" + encodeURIComponent(sql_query)
+                                      + "&show_query=1"
+                                      + "&token=" + token);
             });
         });
         $(".btnDiscard").each(function(){


hooks/post-receive
-- 
phpMyAdmin