Changeset 25224

Timestamp:

Oct 29, 2013, 11:38:54 PM (11 years ago)

Author:

plg

Message:

merge r25223 from branch 2.5 to trunk

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

File:

• trunk/admin/batch_manager.php (modified) (1 diff)

trunk/admin/batch_manager.php

@@ -278 +278 @@
 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');