Index: openacs-4/packages/xowiki/tcl/form-field-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/form-field-procs.tcl,v
diff -u -r1.116 -r1.117
--- openacs-4/packages/xowiki/tcl/form-field-procs.tcl	12 Oct 2008 19:48:58 -0000	1.116
+++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl	15 Oct 2008 10:23:53 -0000	1.117
@@ -1013,7 +1013,11 @@
   }
   richtext instproc pretty_value {v} {
     # for richtext, perform minimal output escaping
-    return [string map [list @ "@"] $v]
+    if {[my wiki]} {
+      return [[my object] substitute_markup [list $v text/html]]
+    } else {
+      return [string map [list @ "@"] $v]
+    }
   }
 
   ###########################################################
@@ -1391,7 +1395,7 @@
       #my msg "where '$where' => wc=[array get wc]"
     }
     set options [list]    
-    set items [::xowiki::FormPage get_children \
+    set items [::xowiki::FormPage get_form_entries \
                    -base_item_id [$form_obj item_id] \
                    -form_fields [list] \
                    -publish_status ready \