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.368.2.50 -r1.368.2.51
--- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	19 Nov 2019 13:46:11 -0000	1.368.2.50
+++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	25 Nov 2019 09:51:13 -0000	1.368.2.51
@@ -1745,16 +1745,17 @@
     # Set up template variables.
     #
     set object_type [::$page_package_id get_parameter object_type [:info class]]
-    set rev_link    [::$page_package_id make_link -with_entities 0 [self] revisions]
+    set rev_link    [::$page_package_id make_link [self] revisions]
 
     if {[::$context_package_id query_parameter m ""] eq "edit"} {
-      set view_link [::$page_package_id make_link -with_entities 0 [self] view return_url]
+      set view_link [::$page_package_id make_link [self] view return_url]
       set edit_link ""
     } else {
-      set edit_link [::$page_package_id make_link -with_entities 0 [self] edit return_url]
+      set edit_link [::$page_package_id make_link [self] edit return_url]
       set view_link ""
     }
-    set delete_link [::$page_package_id make_link -with_entities 0 [self] delete return_url]
+
+    set delete_link [::$page_package_id make_link [self] delete return_url]
     if {[info exists :__link(new)]} {
       set new_link [set :__link(new)]
     } else {
@@ -1766,7 +1767,7 @@
     set toc_link    [::$context_package_id make_link -privilege public ::$folder_id list]
     set import_link [::$context_package_id make_link -privilege admin -link admin/import $context_package_id]
     set page_show_link [::$page_package_id make_link -privilege admin [self] show-object return_url]
-    set view_link   [::$page_package_id make_link -with_entities 0 [self] view return_url]
+    set view_link   [::$page_package_id make_link [self] view return_url]
 
     set notification_subscribe_link ""
     if {[::$context_package_id get_parameter "with_notifications" 1]} {
@@ -2631,7 +2632,7 @@
       #:log "container $name: compute value for [$f info class]"
       if {![$f is_disabled]} {
         dict set :instance_attributes $name [$f value]
-        #:log "container $name: is set to '[dict get ${:instance_attributes} $name]'"        
+        #:log "container $name: is set to '[dict get ${:instance_attributes} $name]'"
       } elseif {[dict exists ${:instance_attributes} $name]} {
         $f value [dict get ${:instance_attributes} $name]
       }