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.18 -r1.54.2.19
--- openacs-4/packages/xowiki/tcl/chat-procs.tcl	14 Aug 2020 19:12:28 -0000	1.54.2.18
+++ openacs-4/packages/xowiki/tcl/chat-procs.tcl	9 Sep 2020 10:22:57 -0000	1.54.2.19
@@ -581,49 +581,36 @@
         -conf       $conf
     #:log "--CHAT created c1 with mode=$mode"
 
+    set js ""
     set data [c1 login]
     if {$data ne ""} {
-      append html [subst {
-        <script nonce='[security::csp::nonce]'>
-          var data = $data;
-          for(var i = 0; i < data.length; i++) {
-            renderData(data\[i\]);
-          }
-        </script>
+      append js [subst {
+        var data = $data;
+        for (var i = 0; i < data.length; i++) {
+          renderData(data\[i\]);
+        }
       }]
     }
 
     if {$fs_link_p} {
-      append html [subst {
-        <script nonce='[security::csp::nonce]'>
-          addFullScreenLink();
-        </script>
-      }]
+      append js {addFullScreenLink();}
     }
 
-    append html [subst {
-      <script nonce='[security::csp::nonce]'>
-        addSendPic();
-      </script>
-    }]
+    append js {addSendPic();}
 
     #:log "--CHAT create HTML for mode=$mode"
 
     switch -- $mode {
       "polling" {
-        append html [subst {
-          <script nonce='[security::csp::nonce]'>
-             chatSubscribe('$subscribe_url');
-          </script>
+        append js [subst {
+          chatSubscribe('$subscribe_url');
         }]
         set send_msg_handler pollingSendMsgHandler
       }
 
       "streaming" {
-        append html [subst {
-          <script nonce='[security::csp::nonce]'>
-             chatSubscribe('$subscribe_url');
-          </script>
+        append js [subst {
+          chatSubscribe('$subscribe_url');
         }]
         set send_msg_handler streamingSendMsgHandler
       }
@@ -637,6 +624,11 @@
         set send_msg_handler scriptedStreamingSendMsgHandler
       }
     }
+    append html [subst {
+      <script nonce='[security::csp::nonce]'>
+      $js
+      </script>
+    }]
 
     template::add_refresh_on_history_handler