[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2-2487-gb8db7a6

[Dieter Adriaenssens]

The branch, master has been updated
       via  b8db7a63eb9a97d9f35e63f2fdf1e9737d9e7a87 (commit)
       via  a3a47a429d674bfbac81890c9d24626ed5d3da47 (commit)
       via  f57a5cfdf91262e63f2e8a9649412d6fec2dbf54 (commit)
       via  6b5edbe6db695f364477cf16b907bcd6cedc03f9 (commit)
      from  f55823f47fd099cbbc3717fdbf0cfec8135927ed (commit)


- Log -----------------------------------------------------------------
commit b8db7a63eb9a97d9f35e63f2fdf1e9737d9e7a87
Merge: f55823f47fd099cbbc3717fdbf0cfec8135927ed a3a47a429d674bfbac81890c9d24626ed5d3da47
Author: Dieter Adriaenssens <ruleant at users.sourceforge.net>
Date:   Mon May 3 23:25:49 2010 +0200

    merge QA_3_3

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

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

diff --git a/ChangeLog b/ChangeLog
index 3a522c9..df1988e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -83,6 +83,7 @@ $Id$
 + [core] Include Content Security Policy HTTP headers.
 
 3.3.4.0 (not yet released)
+- bug #2996161 [import] properly escape import value
 
 3.3.3.0 (not yet released)
 - patch #2982480 [navi] Do not group if there would be one table in group,
diff --git a/libraries/import.lib.php b/libraries/import.lib.php
index 8ef3249..cd50694 100644
--- a/libraries/import.lib.php
+++ b/libraries/import.lib.php
@@ -989,7 +989,7 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = NULL, &$additional_sql =
                 }
                 
                 $tempSQLStr .= (($is_varchar) ? "'" : "");
-				$tempSQLStr .= (str_replace("'", "\'", (string)$tables[$i][ROWS][$j][$k]));
+				$tempSQLStr .= PMA_sqlAddslashes((string)$tables[$i][ROWS][$j][$k]);
 				$tempSQLStr .= (($is_varchar) ? "'" : "");
                 
 				if ($k != ($num_cols - 1)) {


hooks/post-receive
-- 
phpMyAdmin