Index: openacs-4/packages/xowiki/tcl/xowiki-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-procs.tcl,v
diff -u -r1.17 -r1.18
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	14 Feb 2006 14:02:31 -0000	1.17
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	15 Feb 2006 12:54:01 -0000	1.18
@@ -908,7 +908,7 @@
     if {[[self]::payload info procs content] ne ""} {
       return  [my substitute_markup [[self]::payload content]]
     } else {
-      return "<pre>[my set text]</pre>"
+      return "<pre>[string map {> &gt; < &lt;} [my set text]]</pre>"
     }
   }
   
Index: openacs-4/packages/xowiki/www/view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/view.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/xowiki/www/view.tcl	14 Feb 2006 14:02:31 -0000	1.9
+++ openacs-4/packages/xowiki/www/view.tcl	15 Feb 2006 12:54:01 -0000	1.10
@@ -46,6 +46,17 @@
   set return_url  [export_vars -base [ad_conn url] item_id]
   set gc_link     [general_comments_create_link $item_id $return_url]
   set gc_comments [general_comments_get_comments $item_id $return_url]
+
+  set template [$folder_id get_payload template]
+  if {$template ne ""} {
+    set __including_page $page
+    set template_code [template::adp_compile -string $template]
+    if {[catch {set content [template::adp_eval template_code]} errmsg]} {
+      set content "Error in Page $title: $errmsg<br>$content"
+    } else {
+      ns_return 200 text/html $content
+    }
+  }
 } else {
   ns_return 200 text/html $content
   ad_script_abort