Changeset 7556


Ignore:
Timestamp:
11/01/10 22:06:51 (9 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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/admin/element_set_global.php

    r7505 r7556  
    452452 
    453453  $query.= ' 
    454   WHERE id IN ('.implode(',', $page['cat_elements_id']).') 
     454  WHERE id IN ('.implode(',', $page['cat_elements_id']).')'; 
     455 
     456  if (is_numeric($_GET['cat'])) 
     457  { 
     458    $query.= ' 
     459    AND category_id = '.$_GET['cat']; 
     460  } 
     461 
     462  $query.= ' 
    455463  '.$conf['order_by'].' 
    456464  LIMIT '.$page['nb_images'].' OFFSET '.$page['start'].' 
  • trunk/admin/element_set_unit.php

    r7505 r7556  
    212212 
    213213  $query.= ' 
    214   WHERE id IN ('.implode(',', $page['cat_elements_id']).') 
     214  WHERE id IN ('.implode(',', $page['cat_elements_id']).')'; 
     215 
     216  if (is_numeric($_GET['cat'])) 
     217  { 
     218    $query.= ' 
     219    AND category_id = '.$_GET['cat']; 
     220  } 
     221 
     222  $query.= ' 
    215223  '.$conf['order_by'].' 
    216224  LIMIT '.$page['nb_images'].' OFFSET '.$page['start'].' 
Note: See TracChangeset for help on using the changeset viewer.