From: Ivan Kohler <ivan@freeside.biz>
Date: Fri, 10 Jul 2015 05:32:26 +0000 (-0700)
Subject: merge RT 4.2.11 and Header changes to disable RT javascript, RT#34237
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=026dc7ad72ba972f230b6709e31fa64397d75ad4;p=freeside.git

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

026dc7ad72ba972f230b6709e31fa64397d75ad4
diff --cc rt/share/html/Elements/Header
index 664da06b0,6c0f425c3..1e7eb3556
--- a/rt/share/html/Elements/Header
+++ b/rt/share/html/Elements/Header
@@@ -110,26 -115,11 +116,15 @@@ if ( $RSSAutoDiscovery ) 
      $head .= qq(<link rel="alternate" href="$RSSAutoDiscovery" type="application/rss+xml" title="RSS RT Search" />);
  }
  
 -my $stylesheet_plugin = "/NoAuth/css/$style/InHeader";
 -if ($m->comp_exists($stylesheet_plugin) ) {
 -    $head .= $m->scomp($stylesheet_plugin);
 +if ($JavaScript) {
 +    $head .= $m->scomp('HeaderJavascript', focus => $Focus, onload => $onload, RichText => $RichText );
- }
 +
- if ($JavaScript) {
 +    my $stylesheet_plugin = "/NoAuth/css/$style/InHeader";
 +    if ($m->comp_exists($stylesheet_plugin) ) {
 +        $head .= $m->scomp($stylesheet_plugin);
 +    }
  }
  
- #<!-- Site CSS from theme editor -->
- #<style type="text/css" media="all" id="sitecss">
- #%# Header is used when there isn't a database (such as in the Installer) which means there is no
- #%# RT::System object, nor are there attributes.
- #% if (blessed(RT->System) and my $attr = RT->System->FirstAttribute('UserCSS')) {
- #<% $attr->Content |n %>
- #% }
- #</style>
- 
  # $m->callback( %ARGS, CallbackName => 'Head' );
  $head .= $m->scomp( '/Elements/Callback', _CallbackName => 'Head', %ARGS );