[geeklog-hg] geeklog: Fix for changeset 4a70366d2aac

[geeklog-cvs at lists.geeklog.net]

changeset 9094:0deadcde06d4
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/0deadcde06d4
user: Tom <websitemaster at cogeco.net>
date: Thu Jun 13 19:05:50 2013 -0400
description:
Fix for changeset 4a70366d2aac

diffstat:

 public_html/lib-common.php |  23 +++++++++++++++++++----
 1 files changed, 19 insertions(+), 4 deletions(-)

diffs (54 lines):

diff -r 86196169d169 -r 0deadcde06d4 public_html/lib-common.php
--- a/public_html/lib-common.php	Thu Jun 13 18:36:36 2013 -0400
+++ b/public_html/lib-common.php	Thu Jun 13 19:05:50 2013 -0400
@@ -975,7 +975,11 @@
         'leftblocks'     => 'leftblocks.thtml',
         'rightblocks'    => 'rightblocks.thtml'
         ));
-    // Blocks in menunavigation.html include menuitem, menuitem_last, menuitem_none
+    $blocks = array('menuitem', 'menuitem_last', 'menuitem_none');
+    foreach ($blocks as $block) {
+        $header->set_block('menunavigation', $block);
+    }        
+    
     $header->parse('menu_elements', 'menunavigation', true);
     
     $header->set_var('doctype', $doctype);
@@ -1692,7 +1696,11 @@
         'leftblocks'     => 'leftblocks.thtml',
         'rightblocks'    => 'rightblocks.thtml'
         ));
-    // Blocks in menunavigation.html include menuitem, menuitem_last, menuitem_none
+    $blocks = array('menuitem', 'menuitem_last', 'menuitem_none');
+    foreach ($blocks as $block) {
+        $header->set_block('menunavigation', $block);
+    } 
+    
     $header->parse('menu_elements', 'menunavigation', true);    
     
     $header->set_var('doctype', $doctype);
@@ -2904,7 +2912,11 @@
     } else {
         $topicnavigation->set_file('topicnavigation', 'topicnavigation.thtml');
     }    
-    // Blocks in topicnavigation.html include option, option-with-hidden, option-off
+    $blocks = array('option', 'option-with-hidden', 'option-off');
+    foreach ($blocks as $block) {
+        $topicnavigation->set_block('topicnavigation', $block);
+    }    
+    
     $retval .= $topicnavigation->parse('item', 'topicnavigation', true);
 
     $topicnavigation->set_var('block_name', str_replace('_', '-', 'section_block'));
@@ -5547,7 +5559,10 @@
 
     $page_navigation = COM_newTemplate($_CONF['path_layout']);
     $page_navigation->set_file('page_navigation', 'pagenavigation.thtml');
-    // Blocks in pagenavigation.html include page, page-current, nav-end, nav-open-ended
+    $blocks = array('page', 'page-current', 'nav-end', 'nav-open-ended');
+    foreach ($blocks as $block) {
+        $page_navigation->set_block('page_navigation', $block);
+    }    
 
     $page_navigation->set_var('lang_first', $LANG05[7]);
     $page_navigation->set_var('lang_previous', $LANG05[6]);