From 195791c4e284204c4ff7d9ead9e7448d1cfc20ad Mon Sep 17 00:00:00 2001 From: plegall Date: Sat, 5 Sep 2015 00:05:35 +0200 Subject: fixes #348 force logical album sort order This way we can safely remove empty albums without decrementing count_categories twice. --- include/functions_category.inc.php | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'include/functions_category.inc.php') diff --git a/include/functions_category.inc.php b/include/functions_category.inc.php index 15ab84c25..296b8eca2 100644 --- a/include/functions_category.inc.php +++ b/include/functions_category.inc.php @@ -491,6 +491,7 @@ SELECT image_id function get_computed_categories(&$userdata, $filter_days=null) { $query = 'SELECT c.id AS cat_id, id_uppercat'; + $query.= ', global_rank'; // Count by date_available to avoid count null $query .= ', MAX(date_available) AS date_last, COUNT(date_available) AS nb_images @@ -533,6 +534,11 @@ FROM '.CATEGORIES_TABLE.' as c $cats[$row['cat_id']] = $row; } + // it is important to logically sort the albums because some operations + // (like removal) rely on this logical order. Child album doesn't always + // have a bigger id than its parent (if it was moved afterwards). + uasort($cats, 'global_rank_compare'); + foreach ($cats as $cat) { if ( !isset( $cat['id_uppercat'] ) ) -- cgit v1.2.3