merge RT 4.2.11 and Header changes to disable RT javascript, RT#34237

diff --git a/rt/share/html/Elements/Header b/rt/share/html/Elements/Header
index fb6cbda..5215934 100755 (executable)
--- a/rt/share/html/Elements/Header
+++ b/rt/share/html/Elements/Header
@@ -117,6 +117,8 @@ if ( $RSSAutoDiscovery ) {
 }
 
 if ($JavaScript) {
+    $head .= $m->scomp('HeaderJavascript', focus => $Focus, onload => $onload, RichText => $RichText );
+
     my $stylesheet_plugin = "/NoAuth/css/$style/InHeader";
     if ($m->comp_exists($stylesheet_plugin) ) {
         $head .= $m->scomp($stylesheet_plugin);
@@ -126,10 +128,6 @@ if ($JavaScript) {
 # $m->callback( %ARGS, CallbackName => 'Head' );
 $head .= $m->scomp( '/Elements/Callback', _CallbackName => 'Head', %ARGS );
 
-if ($JavaScript) {
-    $head .= $m->scomp('HeaderJavascript', focus => $Focus, onload => $onload, RichText => $RichText );
-}
-
 #XXX $head .= <& /Elements/Framekiller &>;
 
 my $etc = ' class="'. join( '',@{$ARGS{'BodyClass'}}). '" ';