From 8f0035ae66bcdff38b07191278500a1e889c6bbf Mon Sep 17 00:00:00 2001 From: plegall Date: Mon, 1 Nov 2010 21:06:30 +0000 Subject: bug 1988 fixed: avoid duplicate thumbnails for photos linked to several categories when managing all photos of one of these categories. git-svn-id: http://piwigo.org/svn/branches/2.1@7555 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/element_set_global.php | 10 +++++++++- admin/element_set_unit.php | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) (limited to 'admin') diff --git a/admin/element_set_global.php b/admin/element_set_global.php index 8377bdd41..eefe08000 100644 --- a/admin/element_set_global.php +++ b/admin/element_set_global.php @@ -466,7 +466,15 @@ SELECT id,path,tn_ext,file,filesize,level } $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'].' ;'; diff --git a/admin/element_set_unit.php b/admin/element_set_unit.php index f4901a343..fa89db7f2 100644 --- a/admin/element_set_unit.php +++ b/admin/element_set_unit.php @@ -211,7 +211,15 @@ SELECT id,path,tn_ext,name,date_creation,comment,author,level,file } $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'].' ;'; -- cgit v1.2.3