merge r25223 from branch 2.5 to trunk

bug 2992 fixed: escape all file names before searching them as duplicates in batch manager.



git-svn-id: http://piwigo.org/svn/trunk@25224 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall
2013-10-29 22:38:54 +00:00
parent 475d8a6554
commit 42d65801a8

View File

@@ -277,7 +277,7 @@ SELECT file
$query = '
SELECT id
FROM '.IMAGES_TABLE.'
WHERE file IN (\''.implode("','", $duplicate_files).'\')
WHERE file IN (\''.implode("','", array_map('pwg_db_real_escape_string', $duplicate_files)).'\')
;';
$filter_sets[] = array_from_query($query, 'id');