From 6fc4ec3795dd4177630cd2448d3dbec23b340069 Mon Sep 17 00:00:00 2001 From: plegall Date: Sat, 30 Oct 2010 20:03:30 +0000 Subject: merge r7504 from branch 2.1 to trunk bug 1906 fixed: during batch management, for a given category, use the category defined sort order for photos, not the generic order_by. git-svn-id: http://piwigo.org/svn/trunk@7505 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/element_set_global.php | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'admin/element_set_global.php') diff --git a/admin/element_set_global.php b/admin/element_set_global.php index 1a6c82b85..3824b98eb 100644 --- a/admin/element_set_global.php +++ b/admin/element_set_global.php @@ -434,7 +434,23 @@ if (count($page['cat_elements_id']) > 0) $query = ' SELECT id,path,tn_ext,file,filesize,level - FROM '.IMAGES_TABLE.' + FROM '.IMAGES_TABLE; + + if (is_numeric($_GET['cat'])) + { + $category_info = get_cat_info($_GET['cat']); + + $conf['order_by'] = $conf['order_by_inside_category']; + if (!empty($category_info['image_order'])) + { + $conf['order_by'] = ' ORDER BY '.$category_info['image_order']; + } + + $query.= ' + JOIN '.IMAGE_CATEGORY_TABLE.' ON id = image_id'; + } + + $query.= ' WHERE id IN ('.implode(',', $page['cat_elements_id']).') '.$conf['order_by'].' LIMIT '.$page['nb_images'].' OFFSET '.$page['start'].' -- cgit v1.2.3