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.37 -r1.38
--- openacs-4/packages/xowiki/tcl/link-procs.tcl	13 Nov 2007 11:36:11 -0000	1.37
+++ openacs-4/packages/xowiki/tcl/link-procs.tcl	10 Jan 2008 20:57:26 -0000	1.38
@@ -52,7 +52,6 @@
     if {$href eq ""} {
       return \[$label\]
     } else {
-      set href [string map [list & "&"] $href]
       return "<a href='$href'> \[ </a>$label <a href='$href'> \] </a>"
     }
   }
@@ -76,10 +75,11 @@
       set object_type [[$page info class] set object_type]
       set name [my name]
       set title [my label]
-      set href [export_vars -base [$package_id package_url] \
-                    {{edit-new 1} object_type name title}]
+      set new_link  [$package_id make_link $package_id edit-new object_type name title] 
+      #set href [export_vars -base [$package_id package_url] \
+      #              {{edit-new 1} object_type name title}]
 
-      my render_not_found $href [my label]
+      my render_not_found $new_link [my label]
     }
   }