[freeside-commits] branch master updated. 9c67763013a6d16725f50637fe43bde5fe15bcd4

[Ivan]

The branch, master has been updated
       via  9c67763013a6d16725f50637fe43bde5fe15bcd4 (commit)
      from  7903b3fb9ae73fc5fb46f98575141fbe9713f880 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9c67763013a6d16725f50637fe43bde5fe15bcd4
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Thu Jul 9 23:16:16 2015 -0700

    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 5215934..3aeb319 100755
--- a/rt/share/html/Elements/Header
+++ b/rt/share/html/Elements/Header
@@ -106,6 +106,7 @@ if ( $JavaScript ) {
 
 for my $cssfile ( @css_files ) {
   $head .= qq(<link rel="stylesheet" href="$WebPath$cssfile" type="text/css" media="all" />\n);
+}
 
 for (keys %{$LinkRel || {}}) {
   $head .= qq(<link rel="$_" href="$WebPath) . $LinkRel->{$_} . '" />';
@@ -148,4 +149,5 @@ $LinkRel => undef
 $SkipDoctype => 0
 $RichText => 1
 $BodyClass => undef
+$JavaScript => 1
 </%ARGS>

-----------------------------------------------------------------------

Summary of changes:
 rt/share/html/Elements/Header |    2 ++
 1 file changed, 2 insertions(+)