diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2015-07-10 01:27:59 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2015-07-10 01:27:59 -0700 |
| commit | ed896d3f361d812337ec44dd4cf8f561d4192a80 (patch) | |
| tree | 1e0ca56679b5f44465974a939a3715cb13f3cee5 | |
| parent | 4460a9b975060d47a2076d3eae93c3d440106c60 (diff) | |
fix RT 4.2.11 javascript inclusion, at least for RichText / ckeditor, RT#13852
| -rw-r--r-- | htetc/freeside-rt.conf | 10 | ||||
| -rwxr-xr-x | rt/share/html/Elements/Header | 5 |
2 files changed, 12 insertions, 3 deletions
diff --git a/htetc/freeside-rt.conf b/htetc/freeside-rt.conf index bcc5de3bd..fe0142e05 100644 --- a/htetc/freeside-rt.conf +++ b/htetc/freeside-rt.conf @@ -90,3 +90,13 @@ SetHandler perl-script PerlHandler HTML::Mason </Directory> +#XXX support running without /freeside in 4.x? or are we just giving up on +# that and putting a redirect in at / ? +Alias /freeside/rt/static "/opt/rt3/share/static" +<Directory "/opt/rt3/share/static"> +<Limit GET POST> +allow from all +Satisfy any +</Limit> +</Directory> + diff --git a/rt/share/html/Elements/Header b/rt/share/html/Elements/Header index 3aeb31972..3a5be7aee 100755 --- a/rt/share/html/Elements/Header +++ b/rt/share/html/Elements/Header @@ -101,7 +101,7 @@ my $WebImagesURL = RT->Config->Get('WebImagesURL'); my $squished = RT->Config->Get('DevelMode') ? '' : '-squished'; if ( $JavaScript ) { - $head .= $m->scomp('JavascriptConfig'); + $head .= $m->scomp('/Elements/JavascriptConfig'); } for my $cssfile ( @css_files ) { @@ -118,7 +118,7 @@ if ( $RSSAutoDiscovery ) { } if ($JavaScript) { - $head .= $m->scomp('HeaderJavascript', focus => $Focus, onload => $onload, RichText => $RichText ); + $head .= $m->scomp('/Elements/HeaderJavascript', focus => $Focus, onload => $onload, RichText => $RichText ); my $stylesheet_plugin = "/NoAuth/css/$style/InHeader"; if ($m->comp_exists($stylesheet_plugin) ) { @@ -135,7 +135,6 @@ my $etc = ' class="'. join( '',@{$ARGS{'BodyClass'}}). '" '; $etc .= qq[ id="comp-$id"] if $id; </%INIT> - <%ARGS> #$Focus => 'focus' $Focus => '' |