From: ivan <ivan>
Date: Wed, 25 Aug 2010 22:55:25 +0000 (+0000)
Subject: fix fckeditor damage from dashboard fixes: Elements/Footer inadvertantly included... 
X-Git-Tag: freeside_2_1_1^2~90
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=d37e29db87490cba5793a0db5121b7b6010feef0;p=freeside.git

fix fckeditor damage from dashboard fixes: Elements/Footer inadvertantly included in css and javascript, RT#9412
---

diff --git a/rt/FREESIDE_MODIFIED b/rt/FREESIDE_MODIFIED
index 50b44ec70..e14781e70 100644
--- a/rt/FREESIDE_MODIFIED
+++ b/rt/FREESIDE_MODIFIED
@@ -18,6 +18,7 @@ lib/RT/Tickets_Overlay.pm #customfield date patch
 lib/RT/URI/freeside.pm
 lib/RT/URI/freeside/Internal.pm
 lib/RT/URI/freeside/XMLRPC.pm
+ share/html/autohandler #Footer getting appended where unwelcome
  share/html/Admin/Users/Modify.html
  share/html/Elements/CollectionList
 share/html/Elements/EditCustomFieldDate #customfield date patch (NEW)
diff --git a/rt/share/html/autohandler b/rt/share/html/autohandler
index 1bb2c939f..b44bd68d5 100755
--- a/rt/share/html/autohandler
+++ b/rt/share/html/autohandler
@@ -52,7 +52,9 @@ $m->callback( ARGSRef => \%ARGS, CallbackName => 'Init', CallbackPage => '/autoh
 
 RT::Interface::Web::HandleRequest(\%ARGS);
 
-$m->comp( '/Elements/Footer', %ARGS );
+$m->comp( '/Elements/Footer', %ARGS )
+  unless $r->content_type =~ qr<^(text|application)/(x-)?(css|javascript)>;
+
 </%INIT>
 <%ARGS>
 $user => undef