diff options
| author | Jonathan Prykop <jonathan@freeside.biz> | 2016-02-03 17:21:10 -0600 |
|---|---|---|
| committer | Jonathan Prykop <jonathan@freeside.biz> | 2016-02-03 17:21:10 -0600 |
| commit | aef9ece6ee08c7d3a5e10a40abd9d1a8e18806b2 (patch) | |
| tree | 6361818b74350d76b1dde691ce40a60e31ec11df /rt | |
| parent | 6e9e3f39f0b719a53400b28b8e9784197cb6ef92 (diff) | |
RT#34237 v3 reconcile commit 9c67763013a6d16725f50637fe43bde5fe15bcd4
Diffstat (limited to 'rt')
| -rwxr-xr-x | rt/share/html/Elements/Header | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/rt/share/html/Elements/Header b/rt/share/html/Elements/Header index 664da06b0..c409373dd 100755 --- a/rt/share/html/Elements/Header +++ b/rt/share/html/Elements/Header @@ -98,9 +98,14 @@ my $squished = RT->Config->Get('DevelMode') ? '' : '-squished'; $head .= qq(<link rel="shortcut icon" href="${WebImagesURL}favicon.png" type="image/png" />\n); for my $cssfile ( @css_files ) { +<<<<<<< HEAD $head .= qq(<link rel="stylesheet" href="$WebPath/NoAuth/css/$cssfile" type="text/css" media="all" />\n); } $head .= qq(<link rel="stylesheet" href="$WebPath/NoAuth/css/print.css" type="text/css" media="print" />\n); +======= + $head .= qq(<link rel="stylesheet" href="$WebPath$cssfile" type="text/css" media="all" />\n); +} +>>>>>>> 9c67763... merge RT 4.2.11 and Header changes to disable RT javascript, RT#34237 for (keys %{$LinkRel || {}}) { $head .= qq(<link rel="$_" href="$WebPath) . $LinkRel->{$_} . '" />'; @@ -154,4 +159,6 @@ $LinkRel => undef $JavaScript => 1 $SkipDoctype => 0 $RichText => 1 +$BodyClass => undef +$JavaScript => 1 </%ARGS> |