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.50 -r1.51
--- openacs-4/packages/xowiki/tcl/form-field-procs.tcl	8 Jan 2008 17:07:24 -0000	1.50
+++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl	17 Jan 2008 13:00:14 -0000	1.51
@@ -270,10 +270,10 @@
   
   FormField instproc render_form_widget {} {
     # This method provides the form-widget wrapper
-    ::html::div -class form-widget { my render_content }
+    ::html::div -class form-widget { my render_input }
   }
 
-  FormField instproc render_content {} {
+  FormField instproc render_input {} {
     # This is the most general widget content renderer. 
     # If no special renderer is defined, we fall back to this one, 
     # which is in most cases  a simple input fied of type string.
@@ -356,7 +356,7 @@
   FormField::submit_button  instproc initialize {} {
     my set type submit
   }
-  FormField::submit_button instproc render_content {} {
+  FormField::submit_button instproc render_input {} {
     my set value [::xo::localize [_ xowiki.Form-submit_button]]
     ::html::div -class form-button {
       #::html::br 
@@ -394,7 +394,7 @@
     my type hidden
     my set widget_type text(inform)
   }
-  FormField::inform instproc render_content {} {
+  FormField::inform instproc render_input {} {
     ::html::t [my value]
     ::html::input [my get_attributes type id name value] {}
   }
@@ -505,7 +505,7 @@
     next
   }
 
-  FormField::textarea instproc render_content {} {
+  FormField::textarea instproc render_input {} {
     ::html::textarea [my get_attributes id name cols rows style {CSSclass class}] {
       ::html::t [my value]
     }
@@ -584,7 +584,7 @@
     next
     my set widget_type richtext
   }
-  FormField::richtext::wym instproc render_content {} {
+  FormField::richtext::wym instproc render_input {} {
     ::xo::Page requireCSS "/resources/xowiki/wymeditor/skins/default/screen.css"
     ::xo::Page requireJS  "/resources/xowiki/jquery/jquery.js"
     ::xo::Page requireJS  "/resources/xowiki/wymeditor/jquery.wymeditor.pack.js"
@@ -635,7 +635,7 @@
     }
     my set options [my get_attributes editor plugins width height folder_id javascript]
   }
-  FormField::richtext::xinha instproc render_content {} {
+  FormField::richtext::xinha instproc render_input {} {
     # we use for the time being the initialization of xinha based on 
     # the site master
     set ::acs_blank_master(xinha) 1
@@ -673,7 +673,7 @@
   FormField::radio instproc initialize {} {
     my set widget_type text(radio)
   }
-  FormField::radio instproc render_content {} {
+  FormField::radio instproc render_input {} {
     set value [my value]
     foreach o [my options] {
       foreach {label rep} $o break
@@ -698,7 +698,7 @@
   FormField::select instproc initialize {} {
     my set widget_type text(select)
   }
-  FormField::select instproc render_content {} {
+  FormField::select instproc render_input {} {
     set atts [my get_attributes id name]
     if {[my multiple]} {lappend atts multiple [my multiple]}
     set options [my options]
@@ -969,7 +969,7 @@
     error "no component named $component_name of compound field [my name]"
   }
 
-  CompoundField instproc render_content {} {
+  CompoundField instproc render_input {} {
     #
     # Render content within in a fieldset, but with labels etc.
     #
@@ -987,7 +987,7 @@
 
   Class FormField::label -superclass FormField -parameter {}
   FormField::label instproc initialize {} {next}
-  FormField::label instproc render_content {} {
+  FormField::label instproc render_input {} {
     html::t [my value]
   }
 
@@ -1115,19 +1115,19 @@
     return [lc_time_fmt $v [string map [list _ " "] [my display_format]] [my locale]]
   }
 
-  FormField::date instproc render_content {} {
+  FormField::date instproc render_input {} {
     #
     # render the content inline withing a fieldset, without labels etc.
     #
     my set style "margin: 0px; padding: 0px;"
     html::fieldset [my get_attributes id style] {
-      foreach c [my components] { $c render_content }
+      foreach c [my components] { $c render_input }
     }
   }
 
   ###########################################################
   #
-  # ::xowiki::FormField::boolean
+  # ::Xowiki::boolean
   #
   ###########################################################
 
Index: openacs-4/packages/xowiki/tcl/package-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/package-procs.tcl,v
diff -u -r1.108 -r1.109
--- openacs-4/packages/xowiki/tcl/package-procs.tcl	11 Jan 2008 13:35:45 -0000	1.108
+++ openacs-4/packages/xowiki/tcl/package-procs.tcl	17 Jan 2008 13:00:14 -0000	1.109
@@ -175,7 +175,7 @@
   #
   # conditional links
   #
-  Package ad_instproc make_link {-privilege -link object method args} {
+  Package ad_instproc make_link {{-with_entities 1} -privilege -link object method args} {
     Creates conditionally a link for use in xowiki. When the generated link 
     will be activated, the specified method of the object will be invoked.
     make_link checks in advance, wether the actual user has enough 
@@ -218,7 +218,9 @@
       lappend args [list m $method]
       set computed_link [uplevel export_vars -base [list $base] [list $args]]
     }
-    regsub -all & $computed_link "&" computed_link
+    if {$with_entities} {
+      regsub -all & $computed_link "&" computed_link
+    }
 
     set party_id [::xo::cc user_id]
     if {[info exists privilege]} {
Index: openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl,v
diff -u -r1.124 -r1.125
--- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	18 Dec 2007 14:48:36 -0000	1.124
+++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	17 Jan 2008 13:00:14 -0000	1.125
@@ -221,7 +221,7 @@
         #
         array set property_body [::xo::Page get_property body]
         array set property_doc  [::xo::Page get_property doc]
-
+        # ns_log notice "XOWIKI body=[::xo::Page get_property body]"
         $package_id return_page -adp $template_file -variables {
           name title item_id context header_stuff return_url
           content footer package_id
@@ -695,7 +695,6 @@
     return $field_names
   }
 
-
   Page instproc save_attributes {} {
     my instvar package_id
     set field_names [my field_names]
@@ -730,7 +729,7 @@
           [my query_parameter "return_url" [$package_id pretty_link [my name]]]
       return
     } else {
-      # todo: handle errors
+      # todo: handle errors in a user friendly way
       my log "we have $validation_errors validation_errors"
     }
     $package_id returnredirect \
@@ -932,7 +931,7 @@
       set f [::xowiki::FormField::submit_button new -destroy_on_cleanup \
                  -name __form_button_ok \
                  -CSSclass $submit_button_class]
-      $f render_content
+      $f render_input
     }
     set form [lindex [$root selectNodes //form] 0]
     if {$form eq ""} {