[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2-4156-g4cbfcac

17 Jun 2011

The branch, master has been updated
       via  4cbfcacc3a8b309b27ce837e2ab97d31125ea9f5 (commit)
       via  be0f02abf5dc3054329172e62fdc8f3e9c38a86d (commit)
       via  ada8916b98d5a74e3bb4124e3d9dd417af69e007 (commit)
       via  5f664dc7591d018ab15bb761ef7c44555ab97ca6 (commit)
       via  6c39191b03421d41d92bafc9252b0095862e71ed (commit)
       via  c3cba1170c4ca1073b301f875c8ad94704e025aa (commit)
       via  1906a9b1bb848966eeed3053803ec5a2e74d7fdb (commit)
       via  c5deb8cdacb217f2ba1e3c378e42c8a61d4789a0 (commit)
       via  37eb5c0955b8e953527007a2a4818195c86bcada (commit)
       via  37f18cc9be747235c6f7d3f48f43f0bd9a234296 (commit)
       via  5d6a5a8adb55455a3bc152089fd5663eee508ce7 (commit)
       via  7cd81057f585ec97ea0055b5c88fd0c29981c552 (commit)
       via  0cd84b36be4c6c11982649014606eb7a3debfdc3 (commit)
       via  a98347aa541297d10ec4ba88ef2e32b2c0708956 (commit)
       via  e74be51e680e80088834f69c37d4784bae235d44 (commit)
       via  a4d680782b166565b83a8614a148ff72975185f2 (commit)
       via  6a50a944b7a7924719d96b5d69b9d74f8f788733 (commit)
      from  c4ae361ecb6f50e61bc477891802ce7cf2da11ae (commit)


- Log -----------------------------------------------------------------
commit 4cbfcacc3a8b309b27ce837e2ab97d31125ea9f5
Merge: be0f02abf5dc3054329172e62fdc8f3e9c38a86d c4ae361ecb6f50e61bc477891802ce7cf2da11ae
Author: Rouslan Placella <rouslan@placella.com>
Date:   Fri Jun 17 21:15:07 2011 +0100

    Merge remote-tracking branch 'origin/master'

commit be0f02abf5dc3054329172e62fdc8f3e9c38a86d
Merge: 5f664dc7591d018ab15bb761ef7c44555ab97ca6 ada8916b98d5a74e3bb4124e3d9dd417af69e007
Author: Rouslan Placella <rouslan@placella.com>
Date:   Fri Jun 17 21:10:47 2011 +0100

    Merge branch 'QA_3_4'

commit 5f664dc7591d018ab15bb761ef7c44555ab97ca6
Merge: 6c39191b03421d41d92bafc9252b0095862e71ed fb799d270596f91420eedb3e7bee99200bf717c4
Author: Rouslan Placella <rouslan@placella.com>
Date:   Fri Jun 17 17:10:02 2011 +0100

    Merge remote-tracking branch 'origin/master'

commit 6c39191b03421d41d92bafc9252b0095862e71ed
Merge: c3cba1170c4ca1073b301f875c8ad94704e025aa 25dc50a5dd8a69f435272d37f7febafffc1d0ff0
Author: Rouslan Placella <rouslan@placella.com>
Date:   Tue Jun 14 19:43:21 2011 +0100

    Merge remote-tracking branch 'origin/master'

commit c3cba1170c4ca1073b301f875c8ad94704e025aa
Merge: 1906a9b1bb848966eeed3053803ec5a2e74d7fdb 54c062c0ad19db67250fde19eff7f44f31429e74
Author: Rouslan Placella <rouslan@placella.com>
Date:   Fri Jun 10 18:45:47 2011 +0100

    Merge remote-tracking branch 'origin/master'

commit 1906a9b1bb848966eeed3053803ec5a2e74d7fdb
Merge: c5deb8cdacb217f2ba1e3c378e42c8a61d4789a0 cd5cddb2e4324094eae365e01422e8d165d372e8
Author: Rouslan Placella <rouslan@placella.com>
Date:   Thu Jun 9 21:26:07 2011 +0100

    Merge remote-tracking branch 'origin/master'

commit c5deb8cdacb217f2ba1e3c378e42c8a61d4789a0
Merge: 37eb5c0955b8e953527007a2a4818195c86bcada 6bc5a845f49d1f1b0864f37dceaeaa4b52fefdff
Author: Rouslan Placella <rouslan@placella.com>
Date:   Wed Jun 8 11:30:30 2011 +0100

    Merge remote-tracking branch 'origin/master'

commit 37eb5c0955b8e953527007a2a4818195c86bcada
Merge: 37f18cc9be747235c6f7d3f48f43f0bd9a234296 cf6312f5278f922ab420d501200b175eba987c5e
Author: Rouslan Placella <rouslan@placella.com>
Date:   Mon Jun 6 16:52:37 2011 +0100

    Merge remote-tracking branch 'origin/master'

commit 37f18cc9be747235c6f7d3f48f43f0bd9a234296
Merge: 5d6a5a8adb55455a3bc152089fd5663eee508ce7 3cf4830bbb94ce8fe7078f4a3f4fbac1c6253a8c
Author: Rouslan Placella <rouslan@placella.com>
Date:   Mon Jun 6 12:44:01 2011 +0100

    Merge remote-tracking branch 'origin/master'

commit 5d6a5a8adb55455a3bc152089fd5663eee508ce7
Merge: 7cd81057f585ec97ea0055b5c88fd0c29981c552 8d07c5bd77f86e65843248d31ccfa7d4d28a6586
Author: Rouslan Placella <rouslan@placella.com>
Date:   Sat Jun 4 20:25:54 2011 +0100

    Merge remote-tracking branch 'origin/master'

commit 7cd81057f585ec97ea0055b5c88fd0c29981c552
Merge: 0cd84b36be4c6c11982649014606eb7a3debfdc3 bbe878d703b96575308056a788bef72f61d7c9d0
Author: Rouslan Placella <rouslan@placella.com>
Date:   Fri Jun 3 10:51:35 2011 +0100

    Merge remote-tracking branch 'origin/master'

commit 0cd84b36be4c6c11982649014606eb7a3debfdc3
Merge: a98347aa541297d10ec4ba88ef2e32b2c0708956 d6b26b2d8f0cdd4b4bfb798e0b34f2974007fa85
Author: Rouslan Placella <rouslan@placella.com>
Date:   Thu Jun 2 20:01:35 2011 +0100

    Merge remote-tracking branch 'origin/master'

commit a98347aa541297d10ec4ba88ef2e32b2c0708956
Merge: e74be51e680e80088834f69c37d4784bae235d44 469624c23d97848da668c787ae15d75199ac6272
Author: Rouslan Placella <rouslan@placella.com>
Date:   Thu Jun 2 15:14:04 2011 +0100

    Merge remote-tracking branch 'origin/master'

commit e74be51e680e80088834f69c37d4784bae235d44
Merge: a4d680782b166565b83a8614a148ff72975185f2 2da400447c6993d46b969a1c9c863fd81817f67e
Author: Rouslan Placella <rouslan@placella.com>
Date:   Thu Jun 2 11:06:40 2011 +0100

    Merge remote-tracking branch 'origin/master'

commit a4d680782b166565b83a8614a148ff72975185f2
Merge: 6a50a944b7a7924719d96b5d69b9d74f8f788733 575f265293ffe0625da6a8fc0877a84d595d5322
Author: Rouslan Placella <rouslan@placella.com>
Date:   Tue May 31 19:27:52 2011 +0100

    Merge remote-tracking branch 'origin/master'

commit 6a50a944b7a7924719d96b5d69b9d74f8f788733
Author: Rouslan Placella <rouslan@placella.com>
Date:   Tue May 31 12:14:20 2011 +0100

    Merge branch 'master', remote-tracking branch 'origin'

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

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

diff --git a/ChangeLog b/ChangeLog
index edbb3ac..09b7813 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -33,6 +33,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 e552b1a..3d69b3a 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -1164,7 +1164,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

    

Rouslan Placella

tags

participants (1)