Changeset 18924

Timestamp:

Nov 4, 2012, 6:41:29 AM (11 years ago)

Author:

rvelices

Message:

all category infos from db are available in template variables and removed second paramater in event (because out of sync with the first one due to the nav bar)

File:

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

trunk/include/category_cats.inc.php

@@ -40 +40 @@
     count_categories
   FROM '.CATEGORIES_TABLE.' c
-    INNER JOIN '.USER_CACHE_CATEGORIES_TABLE.' ucc 
-    ON id = cat_id 
+    INNER JOIN '.USER_CACHE_CATEGORIES_TABLE.' ucc
+    ON id = cat_id
     AND user_id = '.$user['id'];
-  
+
 if ('recent_cats' == $page['section'])
 {
@@ -60 +60 @@
         'AND'
         );
-  
+
 if ('recent_cats' != $page['section'])
 {
@@ -128 +128 @@
       $user_representative_updates_for[ $user['id'].'#'.$row['id'] ] = $image_id;
     }
-    
+
     $row['representative_picture_id'] = $image_id;
     array_push($image_ids, $image_id);
@@ -220 +220 @@
             $user_representative_updates_for[ $user['id'].'#'.$category['id'] ] = $image_id;
           }
-          
+
           $category['representative_picture_id'] = $image_id;
         }
@@ -241 +241 @@
     }
   }
-  
+
   foreach ($infos_of_image as &$info)
   {
@@ -252 +252 @@
 {
   $updates = array();
-  
+
   foreach ($user_representative_updates_for as $user_cat => $image_id)
   {
     list($user_id, $cat_id) = explode('#', $user_cat);
-    
+
     array_push(
       $updates,
@@ -297 +297 @@
       continue;
     }
-    
+
     $category['name'] = trigger_event(
         'render_category_name',
@@ -315 +315 @@
     $representative_infos = $infos_of_image[ $category['representative_picture_id'] ];
 
-    $tpl_var =
-        array(
-          'ID'    => $category['id'],
+    $tpl_var = array_merge( $category, array(
+          'ID'    => $category['id'] /*obsolete*/,
           'representative'   => $representative_infos,
           'TN_ALT'   => strip_tags($category['name']),
@@ -340 +339 @@
                 'subcatify_category_description')),
           'NAME'  => $name,
-        );
+        ) );
     if ($conf['index_new_icon'])
     {
@@ -376 +375 @@
     $tpl_thumbnails_var[] = $tpl_var;
   }
-        
+
   // pagination
   $page['total_categories'] = count($tpl_thumbnails_var);
 
   $tpl_thumbnails_var = array_slice(
-    array_values($tpl_thumbnails_var),
+    $tpl_thumbnails_var,
     $page['startcat'],
     $conf['nb_categories_page']
@@ -387 +386 @@
 
   $derivative_params = trigger_event('get_index_album_derivative_params', ImageStdParams::get_by_type(IMG_THUMB) );
-  $tpl_thumbnails_var = trigger_event('loc_end_index_category_thumbnails', $tpl_thumbnails_var, $categories);
+  $tpl_thumbnails_var = trigger_event('loc_end_index_category_thumbnails', $tpl_thumbnails_var);
   $template->assign( array(
     'category_thumbnails' => $tpl_thumbnails_var,
@@ -394 +393 @@
 
   $template->assign_var_from_handle('CATEGORIES', 'index_category_thumbnails');
-  
+
   // navigation bar
   $page['cats_navigation_bar'] = array();