Index: openacs-4/packages/xowiki/tcl/includelet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/includelet-procs.tcl,v
diff -u -N -r1.197 -r1.198
--- openacs-4/packages/xowiki/tcl/includelet-procs.tcl 16 Jun 2015 19:49:21 -0000 1.197
+++ openacs-4/packages/xowiki/tcl/includelet-procs.tcl 23 Jun 2015 08:04:10 -0000 1.198
@@ -316,7 +316,7 @@
}
::xowiki::Includelet instproc get_page_order {-source -ordered_pages -pages} {
- my instvar page_order ordered_pages
+ my instvar page_order
#
# first check, if we can load the page_order from the page
# denoted by source
@@ -1453,7 +1453,8 @@
foreach cat_id [category::get_mapped_categories [$__including_page set item_id]] {
lassign [category::get_data $cat_id] category_id category_name tree_id tree_name
#my log "--cat $cat_id $category_id $category_name $tree_id $tree_name"
- set entry "[ns_quotehtml $category_name ($tree_name)]"
+ set label [ns_quotehtml "$category_name ($tree_name)"]
+ set entry "$label"
if {$notification_type ne ""} {
set notification_text "Subscribe category $category_name in tree $tree_name"
set notifications_return_url [expr {[info exists return_url] ? $return_url : [ad_return_url]}]
@@ -2334,6 +2335,7 @@
selection instproc render_children {pages menu_buttons} {
my instvar package_id edit_links
+ set output ""
foreach o [$pages children] {
$o instvar page_order title page_id name title
set level [expr {[regsub {[.]} $page_order . page_order] + 1}]