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]} {