[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_8-14-g5f4604c

[Marc Delisle]

The branch, QA_3_3 has been updated
       via  5f4604c9bb4de2cdc2bf6b61f0ac55c898dd964e (commit)
      from  81a338db80012ca67009ac780ee1bffe38dd1ad1 (commit)


- Log -----------------------------------------------------------------
commit 5f4604c9bb4de2cdc2bf6b61f0ac55c898dd964e
Author: Marc Delisle <marc at infomarc.info>
Date:   Sat Nov 6 07:51:06 2010 -0400

    bug #3103853 [js] Double quotes were not escaped in generated js; I think this only applies to 3.3.x

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

Summary of changes:
 ChangeLog                   |    1 +
 libraries/js_escape.lib.php |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1a4f318..e45143a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 3.3.9.0 (not yet released)
 - bug [doc] Fix references to MySQL doc
 - patch #3101490 Default function for TIMESTAMP, thanks to jirand - jirand
+- bug #3103853 [js] Double quotes were not escaped in generated js
 
 3.3.8.0 (2010-10-25)
 - bug #3059311 [import] BIGINT field type added to table analysis
diff --git a/libraries/js_escape.lib.php b/libraries/js_escape.lib.php
index 754d95f..dfa7530 100644
--- a/libraries/js_escape.lib.php
+++ b/libraries/js_escape.lib.php
@@ -61,6 +61,7 @@ function PMA_escapeJsString($string)
                                 "\000" => '',
                                 '\\' => '\\\\',
                                 '\'' => '\\\'',
+                                '"' => '\"',
                                 "\n" => '\n',
                                 "\r" => '\r')));
 }


hooks/post-receive
-- 
phpMyAdmin