Index: openacs-4/packages/xowiki/tcl/chat-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/chat-procs.tcl,v
diff -u -N -r1.54.2.16 -r1.54.2.17
--- openacs-4/packages/xowiki/tcl/chat-procs.tcl	14 Aug 2019 07:36:40 -0000	1.54.2.16
+++ openacs-4/packages/xowiki/tcl/chat-procs.tcl	13 Jan 2020 16:44:42 -0000	1.54.2.17
@@ -308,7 +308,7 @@
     set json [string trim [:json_encode_msg $msg]]
     if {$json ne ""} {
       return [subst {
-        <script type='text/javascript' language='javascript' nonce='$::__csp_nonce'>
+        <script nonce='[security::csp::nonce]'>
            var data = $json;
            parent.getData(data);
         </script>\n
@@ -563,7 +563,7 @@
     set data [c1 login]
     if {$data ne ""} {
       append html [subst {
-        <script nonce='$::__csp_nonce'>
+        <script nonce='[security::csp::nonce]'>
           var data = $data;
           for(var i = 0; i < data.length; i++) {
             renderData(data\[i\]);
@@ -574,14 +574,14 @@
 
     if {$fs_link_p} {
       append html [subst {
-        <script nonce='$::__csp_nonce'>
+        <script nonce='[security::csp::nonce]'>
           addFullScreenLink();
         </script>
       }]
     }
 
     append html [subst {
-      <script nonce='$::__csp_nonce'>
+      <script nonce='[security::csp::nonce]'>
         addSendPic();
       </script>
     }]
@@ -590,8 +590,8 @@
 
     switch -- $mode {
       "polling" {
-        append html [subst -nocommands {
-          <script nonce='$::__csp_nonce'>
+        append html [subst {
+          <script nonce='[security::csp::nonce]'>
              chatSubscribe('$subscribe_url');
           </script>
         }]
@@ -600,7 +600,7 @@
 
       "streaming" {
         append html [subst {
-          <script nonce='$::__csp_nonce'>
+          <script nonce='[security::csp::nonce]'>
              chatSubscribe('$subscribe_url');
           </script>
         }]