Changeset 18892

Timestamp:

Nov 2, 2012, 4:04:54 PM (11 years ago)

Author:

mistic100

Message:

feature:2614 bad display when there are empty albums
revert most of the previous changes and slice the array at the very end

File:

• trunk/include/category_cats.inc.php (modified) (4 diffs)

trunk/include/category_cats.inc.php

@@ -70 +70 @@
 ;';
 
-$categories_sql = hash_from_query($query, 'id');
-
-if ($page['section']=='recent_cats')
-{
-  usort($categories_sql, 'global_rank_compare');
-}
-
-$page['total_categories'] = count($categories_sql);
-
-$categories_sql = array_slice(
-  array_values($categories_sql),
-  $page['startcat'],
-  $conf['nb_categories_page']
-  );
-
-$categories_sql = trigger_event('loc_index_categories_selection', $categories_sql);
-
+$result = pwg_query($query);
 $categories = array();
 $category_ids = array();
@@ -92 +76 @@
 $user_representative_updates_for = array();
 
-foreach ($categories_sql as $row)
+while ($row = pwg_db_fetch_assoc($result))
 {
   $row['is_child_date_last'] = @$row['max_date_last']>@$row['date_last'];
@@ -188 +172 @@
 }
 
+if ($page['section']=='recent_cats')
+{
+  usort($categories, 'global_rank_compare');
+}
+
 if (count($categories) > 0)
 {
@@ -387 +376 @@
     $tpl_thumbnails_var[] = $tpl_var;
   }
+        
+  // pagination
+  $page['total_categories'] = count($tpl_thumbnails_var);
+
+  $tpl_thumbnails_var = array_slice(
+    array_values($tpl_thumbnails_var),
+    $page['startcat'],
+    $conf['nb_categories_page']
+    );
 
   $derivative_params = trigger_event('get_index_album_derivative_params', ImageStdParams::get_by_type(IMG_THUMB) );