Changeset 7556

Timestamp:

Nov 1, 2010, 10:06:51 PM (14 years ago)

Author:

plg

Message:

merge r7555 from branch 2.1 to trunk

bug 1988 fixed: avoid duplicate thumbnails for photos linked to several
categories when managing all photos of one of these categories.

Location:

trunk/admin

Files:

• element_set_global.php (modified) (1 diff)
• element_set_unit.php (modified) (1 diff)

trunk/admin/element_set_global.php

@@ -452 +452 @@
 
   $query.= '
-  WHERE id IN ('.implode(',', $page['cat_elements_id']).')
+  WHERE id IN ('.implode(',', $page['cat_elements_id']).')';
+
+  if (is_numeric($_GET['cat']))
+  {
+    $query.= '
+    AND category_id = '.$_GET['cat'];
+  }
+
+  $query.= '
   '.$conf['order_by'].'
   LIMIT '.$page['nb_images'].' OFFSET '.$page['start'].'

trunk/admin/element_set_unit.php

@@ -212 +212 @@
 
   $query.= '
-  WHERE id IN ('.implode(',', $page['cat_elements_id']).')
+  WHERE id IN ('.implode(',', $page['cat_elements_id']).')';
+
+  if (is_numeric($_GET['cat']))
+  {
+    $query.= '
+    AND category_id = '.$_GET['cat'];
+  }
+
+  $query.= '
   '.$conf['order_by'].'
   LIMIT '.$page['nb_images'].' OFFSET '.$page['start'].'