[freeside-commits] branch FREESIDE_4_BRANCH updated. 8d081a1e84811838d0d6a400030e049d8a9365bd

[Ivan]

The branch, FREESIDE_4_BRANCH has been updated
       via  8d081a1e84811838d0d6a400030e049d8a9365bd (commit)
      from  e09a570e1a1b53a29124e22494ce024840b18052 (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 8d081a1e84811838d0d6a400030e049d8a9365bd
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Thu Jul 9 22:36:49 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 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'}}). '" ';

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

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