Changeset 12630 for trunk/admin/batch_manager.php

Timestamp:

Nov 15, 2011, 12:58:10 PM (12 years ago)

Author:

plg

Message:

merge r12629 from branch 2.3 to trunk

bug 2506 fixed: Batch Manager does not take permissions into account when
filtering on tags

feature 2507 added: Batch Manager can filter on "all tags" or "any tag"

File:

• trunk/admin/batch_manager.php (modified) (2 diffs)

trunk/admin/batch_manager.php

@@ -72 +72 @@
   {
     $_SESSION['bulk_manager_filter']['tags'] = get_tag_ids($_POST['filter_tags'], false);
+
+    if (isset($_POST['tag_mode']) and in_array($_POST['tag_mode'], array('AND', 'OR')))
+    {
+      $_SESSION['bulk_manager_filter']['tag_mode'] = $_POST['tag_mode'];
+    }
   }
 
@@ -298 +303 @@
 if (!empty($_SESSION['bulk_manager_filter']['tags']))
 {
-        $query = '
-SELECT image_id
-        FROM '.IMAGE_TAG_TABLE.
-        'WHERE tag_id IN('.implode(',',$_SESSION['bulk_manager_filter']['tags']).')
-        GROUP BY image_id
-        HAVING COUNT(tag_id)='.count($_SESSION['bulk_manager_filter']['tags']);
-        array_push(
+  array_push(
     $filter_sets,
-                get_image_ids_for_tags($_SESSION['bulk_manager_filter']['tags'])
-                );
+    get_image_ids_for_tags(
+      $_SESSION['bulk_manager_filter']['tags'],
+      $_SESSION['bulk_manager_filter']['tag_mode'],
+      null,
+      null,
+      false // we don't apply permissions in administration screens
+      )
+    );
 }