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.44 -r1.45
--- openacs-4/packages/xowiki/tcl/form-field-procs.tcl	3 Dec 2007 11:54:04 -0000	1.44
+++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl	7 Dec 2007 14:25:04 -0000	1.45
@@ -486,6 +486,7 @@
       } else {
         set link_label $v
       }
+      regsub -all & $v "&" v
       return "<a href='$v'>$link_label</a>"
     }
   }
@@ -505,6 +506,7 @@
     }
     if {$v ne ""} {
       set link_label [my localize [my link_label]]
+      regsub -all & $v "&amp;" v
       return " <span class='more'>\[ <a href='$v'>$link_label</a> \]</span>"
     }
   }