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
Piwigo · Oct 29, 2013 · 42d6580 · 42d6580
1 parent 475d8a6
commit 42d6580
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/admin/batch_manager.php b/admin/batch_manager.php
@@ -277,7 +277,7 @@
     $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');