Changeset 3124 for trunk/include

Timestamp:

Feb 5, 2009, 3:28:37 AM (16 years ago)

Author:

rvelices

Message:

• removed triggers loc_index_thumbnail and loc_index_category_thumbnail
• changed triggers loc_end_index_thumbnails and loc_end_index_category_thumbnails from actions to events

Location:

trunk/include

Files:

• category_cats.inc.php (modified) (4 diffs)
• category_default.inc.php (modified) (3 diffs)

trunk/include/category_cats.inc.php

@@ -221 +221 @@
   trigger_action('loc_begin_index_category_thumbnails', $categories);
 
+  $tpl_thumbnails_var = array();
+
   foreach ($categories as $category)
   {
@@ -238 +240 @@
     }
 
-    $icon_ts = get_icon($category['max_date_last'], $category['is_child_date_last']);
-
     $tpl_var =
         array(
@@ -245 +245 @@
           'TN_SRC'   => $thumbnail_src_of[$category['representative_picture_id']],
           'TN_ALT'   => strip_tags($category['name']),
-          'ICON_TS'  => $icon_ts,
+          'ICON_TS'  => get_icon($category['max_date_last'], $category['is_child_date_last']),
 
           'URL'   => make_index_url(
@@ -296 +296 @@
     }//fromto
 
-    //plugins need to add/modify sth in this loop ?
-    $tpl_var = trigger_event('loc_index_category_thumbnail',
-                  $tpl_var, $category );
-
-    $template->append( 'category_thumbnails', $tpl_var);
-  }
-
-  trigger_action('loc_end_index_category_thumbnails', $categories);
+    $tpl_thumbnails_var[] = $tpl_var;
+  }
+
+  $tpl_thumbnails_var = trigger_event('loc_end_index_category_thumbnails', $tpl_thumbnails_var, $categories);
+  $template->assign( 'category_thumbnails', $tpl_thumbnails_var);
+
   $template->assign_var_from_handle('CATEGORIES', 'index_category_thumbnails');
 }
+pwg_debug('end include/category_cats.inc.php');
 ?>

trunk/include/category_default.inc.php

@@ -91 +91 @@
 
 trigger_action('loc_begin_index_thumbnails', $pictures);
+$tpl_thumbnails_var = array();
 
 foreach ($pictures as $row)
 {
-  $thumbnail_url = get_thumbnail_url($row);
-
   // link on picture.php page
   $url = duplicate_picture_url(
@@ -108 +107 @@
     array(
       'ID'        => $row['id'],
-      'TN_SRC'    => $thumbnail_url,
+      'TN_SRC'    => get_thumbnail_url($row),
       'TN_ALT'    => $row['file'],
       'TN_TITLE'  => get_thumbnail_title($row),
@@ -172 +171 @@
   }
 
-  //plugins need to add/modify sth in this loop ?
-  $tpl_var = trigger_event('loc_index_thumbnail', $tpl_var, $row);
-
-  $template->append('thumbnails', $tpl_var);
+  $tpl_thumbnails_var[] = $tpl_var;
 }
 
-trigger_action('loc_end_index_thumbnails', $pictures);
+$tpl_thumbnails_var = trigger_event('loc_end_index_thumbnails', $tpl_thumbnails_var, $pictures);
+$template->assign('thumbnails', $tpl_thumbnails_var);
+
 $template->assign_var_from_handle('THUMBNAILS', 'index_thumbnails');