Index: openacs-4/packages/xowiki/tcl/includelet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/includelet-procs.tcl,v
diff -u -r1.239.2.35 -r1.239.2.36
--- openacs-4/packages/xowiki/tcl/includelet-procs.tcl	26 Nov 2019 12:54:00 -0000	1.239.2.35
+++ openacs-4/packages/xowiki/tcl/includelet-procs.tcl	13 Jan 2020 16:35:57 -0000	1.239.2.36
@@ -2984,7 +2984,7 @@
 
     if {$allow_reorder ne ""} {
       for {set l $last_level} {$l > 0} {incr l -1} {append output "</ul>\n" }
-      append output "<script type='text/javascript' nonce='$::__csp_nonce'>$js</script>\n"
+      append output "<script type='text/javascript' nonce='[security::csp::nonce]'>$js</script>\n"
     }
     return $output
   }
@@ -3628,7 +3628,7 @@
       <canvas id="collab" width="500" height="500" style="border: 0px solid black">
       </canvas>
       [set nodesHTML]
-      <script type="text/javascript" nonce='[set ::__csp_nonce]'>
+      <script type="text/javascript" nonce='[security::csp::nonce]'>
       function draw() {
         if (typeof(G_vmlCanvasManager) == "object") {
           G_vmlCanvasManager.init_(window.document);
@@ -3858,7 +3858,7 @@
 
     return [subst -nocommands -nobackslashes {
       <div id="my-timeline" style="font-size:70%; height: 350px; border: 1px solid #aaa"></div>
-      <script type="text/javascript" nonce='$::__csp_nonce'>
+      <script type="text/javascript" nonce='[security::csp::nonce]'>
       var tl;
       function onLoad() {
         var eventSource = new Timeline.DefaultEventSource();
@@ -4163,7 +4163,7 @@
     }
     set values [join $values ",\n"]
     append result [subst -nocommands {
-      <script type='text/javascript' nonce='$::__csp_nonce'>
+      <script type='text/javascript' nonce='[security::csp::nonce]'>
       var chart;
       chart = new Highcharts.Chart({
         chart: {
@@ -5175,7 +5175,7 @@
   flowplayer instproc render {} {
     :get_parameters
     return "<a href='[ns_quotehtml $mp4]' style='display:block;width:425px;height:300px;' id='player'> </a>
-    <script type='text/javascript' nonce='$::__csp_nonce'>
+    <script type='text/javascript' nonce='[security::csp::nonce]'>
  flowplayer('player', '/resources/xowiki/flowplayer/flowplayer-3.2.7.swf', {
 
     // this will enable pseudostreaming support