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.75 -r1.76
--- openacs-4/packages/xowiki/tcl/form-field-procs.tcl	29 May 2008 19:13:43 -0000	1.75
+++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl	2 Jun 2008 12:28:13 -0000	1.76
@@ -607,6 +607,7 @@
         folder_id
         width
         height
+        {wiki false}
       }
   
   richtext instproc editor {args} {
@@ -653,7 +654,11 @@
   richtext instproc render_richtext_as_div {} {
     #my msg "[my get_attributes id style {CSSclass class}]"
     ::html::div [my get_attributes id style {CSSclass class}] {
-      ::html::t -disableOutputEscaping [my value]
+      if {[my wiki]} {
+        ::html::t -disableOutputEscaping [[my object] substitute_markup  [list [my value] text/html]]
+      } else {
+        ::html::t -disableOutputEscaping [my value]
+      }
     }
     ::html::div
   }
Index: openacs-4/packages/xowiki/tcl/link-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/link-procs.tcl,v
diff -u -r1.44 -r1.45
--- openacs-4/packages/xowiki/tcl/link-procs.tcl	27 May 2008 08:56:30 -0000	1.44
+++ openacs-4/packages/xowiki/tcl/link-procs.tcl	2 Jun 2008 12:28:13 -0000	1.45
@@ -51,7 +51,7 @@
     #my log "--L link has class [my info class] // $class"
   }
   Link instproc resolve {} {
-    #my log "--lookup of [my name] -page [my page]"
+    #my msg "--lookup of [my name] -page [my page]"
     if {![regexp {(.*?)(\#|%23)+(.*)$} [my name] full_name name anchor_tag anchor]} {
       set name [my name]
     }
@@ -71,7 +71,7 @@
     my instvar package_id
     set page [my page]
     set item_id [my resolve]
-    my log "--u resolve returns $item_id"
+    #my msg "--u resolve returns $item_id"
     if {$item_id} {
       $page lappend references [list $item_id [my type]]
       ::xowiki::Package require $package_id
@@ -85,6 +85,14 @@
     } else {
       $page incr unresolved_references
       set object_type [[$page info class] set object_type]
+      if {$object_type ne "::xowiki::Page" && $object_type ne "::xowiki::PlainPage"} {
+        # TODO: this is a temporary solution. we should find a way to
+        # pass similar to file or image entries the type of this
+        # entry. Maybe we can get the type as well from a kind of
+        # blackboard, where the type of the "edit" wiki-menu-entry is
+        # stored as well.
+        set object_type ::xowiki::Page
+      }
       set name [my name]
       set title [my label]
       set new_link  [$package_id make_link $package_id edit-new object_type name title] 
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.245 -r1.246
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	19 May 2008 17:42:17 -0000	1.245
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	2 Jun 2008 12:28:13 -0000	1.246
@@ -869,6 +869,7 @@
     }
   }
   Page instproc anchor {arg} {
+    #my msg [self args]
     set label $arg
     set link $arg
     set options ""