Changeset 1820 for trunk/include/functions_calendar.inc.php

Timestamp:

Feb 15, 2007, 1:10:41 AM (17 years ago)

Author:

rvelices

Message:

• feature 642: display both subcategory thumbnails and element thumbnails (if a

category has both) in the index page

• get rid of $pagecat_nb_images and $pagethumbnails_include (superfluous)
• changed sql queries in section_init.inc.php for better performance with

flat category view

• web service fixes for categories.getList

File:

• trunk/include/functions_calendar.inc.php (modified) (3 diffs)

trunk/include/functions_calendar.inc.php

@@ -198 +198 @@
   if (script_basename() != 'picture') // basename without file extention
   {
-    $template->assign_block_vars('calendar', array());
-
     if ($calendar->generate_category_content())
     {
-      unset(
-        $page['thumbnails_include'],
-        $page['items']
-        );
-
+      $page['items'] = array();
       $must_show_list = false;
     }
 
-    $template->assign_block_vars( 'calendar.views', array() );
     foreach ($styles as $style => $style_data)
     {
@@ -261 +254 @@
         .$fields[$page['chronology_field']]['label'].'</a>';
     $calendar_title.= $calendar->get_display_name();
-    //this should be an assign_block_vars, but I need to assign 'calendar'
-    //above and at that point I don't have the title yet.
-    $template->_tpldata['calendar.'][0]['TITLE'] = $calendar_title;
+    $template->merge_block_vars('calendar',
+        array(
+          'TITLE' => $calendar_title
+        )
+      );
   } // end category calling
 
@@ -294 +289 @@
   '.$order_by;
     }
-
     $page['items']              = array_from_query($query, 'id');
-    $page['thumbnails_include'] = 'include/category_default.inc.php';
   }
   pwg_debug('end initialize_calendar');