Index: openacs-4/packages/xowiki/tcl/bootstrap-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/bootstrap-procs.tcl,v
diff -u -N -r1.3.2.14 -r1.3.2.15
--- openacs-4/packages/xowiki/tcl/bootstrap-procs.tcl	22 Sep 2016 08:08:09 -0000	1.3.2.14
+++ openacs-4/packages/xowiki/tcl/bootstrap-procs.tcl	3 Oct 2016 14:07:19 -0000	1.3.2.15
@@ -534,10 +534,14 @@
             [set href [$line set $__name.href]] ne ""} {
           # use the CSS class rather from the Field than not the line
           my instvar CSSclass
-          $line instvar   [list $__name.title title] \
-              [list $__name.target target] \
-              [list $__name.onclick onclick] 
-          html::a [my get_local_attributes href title {CSSclass class} target onclick] {
+          $line instvar [list $__name.title title] [list $__name.target target]
+          if {[$line exists $__name.onclick]} {
+            set id [::xowiki::Includelet html_id $line]
+            template::add_event_listener \
+                -id $id \
+                -script "[$line set $__name.onclick];"
+          }
+          html::a [my get_local_attributes href title {CSSclass class} target id] {
             return "[next]"
           }
         }