adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-06-02 04:15:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

merge r7504 from branch 2.1 to trunk

Browse Source 
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
This commit is contained in:
plegall
2010-10-30 20:03:30 +00:00
parent 462e8aa2fc
commit 6fc4ec3795
2 changed files with 34 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/element_set_global.php
+17 -1
View File
@@ -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'].'
admin/element_set_unit.php
+17 -1
View File
@@ -194,7 +194,23 @@ if (count($page['cat_elements_id']) > 0)
$query = '
SELECT id,path,tn_ext,name,date_creation,comment,author,level,file
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'].'