Changeset 2586

Timestamp:

Sep 25, 2008, 2:39:12 AM (16 years ago)

Author:

rvelices

Message:

• sql optim: do not include category_cats (which makes a query) if current category does not have children (info known when building menubar)
• in index.php - fill the template completely before including menubar/category_cats/thumbnails (some themes might want to use in the menubar some vars ...)

Location:

trunk

Files:

• include/functions_category.inc.php (modified) (1 diff)
• index.php (modified) (3 diffs)

trunk/include/functions_category.inc.php

@@ -104 +104 @@
   {
     array_push($cats, $row);
+    if ($row['id']==@$page['category']['id']) //save the number of subcats for later optim
+      $page['category']['count_categories'] = $row['count_categories'];
   }
   usort($cats, 'global_rank_compare');

trunk/index.php

@@ -157 +157 @@
     );
 }
-// include menubar
-include( PHPWG_ROOT_PATH.'include/menubar.inc.php');
 
 if ('search' == $page['section'])
@@ -218 +216 @@
     }
     $template->assign( 'tag_search_results', $hints);
-  }
-}
-
-//------------------------------------------------------ main part : thumbnails
-if ( 0==$page['start']
-    and !isset($page['flat'])
-    and !isset($page['chronology_field'])
-    and ('recent_cats'==$page['section'] or 'categories'==$page['section'])
-  )
-{
-  include(PHPWG_ROOT_PATH.'include/category_cats.inc.php');
-}
-if ( !empty($page['items']) )
-{
-  include(PHPWG_ROOT_PATH.'include/category_default.inc.php');
-}
-//------------------------------------------------------- category informations
-
-// slideshow
-// execute after init thumbs in order to have all picture informations
-if (!empty($page['cat_slideshow_url']))
-{
-  if (isset($_GET['slideshow']))
-  {
-    redirect($page['cat_slideshow_url']);
-  }
-  else
-  {
-    $template->assign('U_SLIDESHOW', $page['cat_slideshow_url']);
   }
 }
@@ -285 +254 @@
   $template->assign('CONTENT_DESCRIPTION', $page['comment'] );
 }
+
+// include menubar
+include( PHPWG_ROOT_PATH.'include/menubar.inc.php');
+
+//------------------------------------------------------ main part : thumbnails
+if ( 0==$page['start']
+    and !isset($page['flat'])
+    and !isset($page['chronology_field'])
+    and ('recent_cats'==$page['section'] or 'categories'==$page['section'])
+    and (!isset($page['category']['count_categories']) or $page['category']['count_categories']>0 )
+  )
+{
+  include(PHPWG_ROOT_PATH.'include/category_cats.inc.php');
+}
+if ( !empty($page['items']) )
+{
+  include(PHPWG_ROOT_PATH.'include/category_default.inc.php');
+}
+//------------------------------------------------------- category informations
+
+// slideshow
+// execute after init thumbs in order to have all picture informations
+if (!empty($page['cat_slideshow_url']))
+{
+  if (isset($_GET['slideshow']))
+  {
+    redirect($page['cat_slideshow_url']);
+  }
+  else
+  {
+    $template->assign('U_SLIDESHOW', $page['cat_slideshow_url']);
+  }
+}
+
 //------------------------------------------------------------ log informations
 pwg_log();