nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge QA_3_3

Browse Source
This commit is contained in:
Dieter Adriaenssens
2010-05-03 23:25:49 +02:00
parent f55823f47f a3a47a429d
commit b8db7a63eb
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -83,6 +83,7 @@ $Id$
+ [core] Include Content Security Policy HTTP headers. + [core] Include Content Security Policy HTTP headers.
3.3.4.0 (not yet released) 3.3.4.0 (not yet released)
- bug #2996161 [import] properly escape import value
3.3.3.0 (not yet released) 3.3.3.0 (not yet released)
- patch #2982480 [navi] Do not group if there would be one table in group, - patch #2982480 [navi] Do not group if there would be one table in group,

2
libraries/import.lib.php
View File

@@ -989,7 +989,7 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = NULL, &$additional_sql =
} }
$tempSQLStr .= (($is_varchar) ? "'" : ""); $tempSQLStr .= (($is_varchar) ? "'" : "");
$tempSQLStr .= (str_replace("'", "\'", (string)$tables[$i][ROWS][$j][$k])); $tempSQLStr .= PMA_sqlAddslashes((string)$tables[$i][ROWS][$j][$k]);
$tempSQLStr .= (($is_varchar) ? "'" : ""); $tempSQLStr .= (($is_varchar) ? "'" : "");
if ($k != ($num_cols - 1)) { if ($k != ($num_cols - 1)) {