Index: openacs-4/packages/xowiki/tcl/tree-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/tree-procs.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/xowiki/tcl/tree-procs.tcl	5 Jun 2009 18:38:27 -0000	1.3
+++ openacs-4/packages/xowiki/tcl/tree-procs.tcl	15 Nov 2009 11:06:59 -0000	1.4
@@ -188,12 +188,13 @@
     return "<ul id='[$tree id]'>[next]</ul>"
   }
   TreeRenderer=list instproc render_item {{-highlight:boolean false} item} {
-    $item instvar title prefix suffix href
+    $item instvar title href
+    set prefix [$item set prefix]
+    set suffix [$item set suffix]
+    if {![$item exists encoded(prefix)]} {set prefix [::xowiki::Includelet html_encode $prefix]}
+    if {![$item exists encoded(suffix)]} {set suffix [::xowiki::Includelet html_encode $suffix]}
     append entry \
-	[::xowiki::Includelet html_encode $prefix] \
-	"<a href='$href'>" \
-	[::xowiki::Includelet html_encode $title] \
-	"</a>[::xowiki::Includelet html_encode $suffix]"
+	$prefix "<a href='$href'>" [::xowiki::Includelet html_encode $title] "</a>" $suffix
     if {$highlight} {
       return "<li class='liItem'><b>$entry</b></li>\n"
     } else {
@@ -318,12 +319,13 @@
   TreeRenderer create TreeRenderer=sections \
       -superclass TreeRenderer=list 
   TreeRenderer=sections instproc render_item {{-highlight:boolean false} item} {
-    $item instvar title prefix suffix href
+    $item instvar title href
+    set prefix [$item set prefix]
+    set suffix [$item set suffix]
+    if {![$item exists encoded(prefix)]} {set prefix [::xowiki::Includelet html_encode $prefix]}
+    if {![$item exists encoded(suffix)]} {set suffix [::xowiki::Includelet html_encode $suffix]}
     append entry \
-	[::xowiki::Includelet html_encode $prefix] \
-	"<a href='$href'>" \
-	[::xowiki::Includelet html_encode $title] \
-	"</a>[::xowiki::Includelet html_encode $suffix]"
+	$prefix "<a href='$href'>" [::xowiki::Includelet html_encode $title] "</a>" $suffix
     if {$highlight} {
       return "<b>$entry</b><br>\n"
     } else {