diff options
author | Ivan Kohler <ivan@freeside.biz> | 2015-07-09 22:36:49 -0700 |
---|---|---|
committer | Ivan Kohler <ivan@freeside.biz> | 2015-07-09 22:36:49 -0700 |
commit | 8d081a1e84811838d0d6a400030e049d8a9365bd (patch) | |
tree | 0b6663eeb24daac43c124c402f994bc1c5c5b67a /rt | |
parent | e09a570e1a1b53a29124e22494ce024840b18052 (diff) |
merge RT 4.2.11 and Header changes to disable RT javascript, RT#34237
Diffstat (limited to 'rt')
-rwxr-xr-x | rt/share/html/Elements/Header | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/rt/share/html/Elements/Header b/rt/share/html/Elements/Header index fb6cbda..5215934 100755 --- 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'}}). '" '; |