merge RT 4.2.11 and Header changes to disable RT javascript, RT#34237

1 files changed, 5 insertions, 8 deletions

diff --git a/rt/share/html/Elements/Error b/rt/share/html/Elements/Error
index 5ca18386e..72bea6991 100755
--- a/rt/share/html/Elements/Error
+++ b/rt/share/html/Elements/Error
@@ -48,7 +48,7 @@
 % $m->callback( %ARGS, error => $error );
 
 % unless ($SuppressHeader) {
-<& /Elements/Header, Code => $Code, Why => $Why, Title => $Title &>
+<& /Elements/Header, Title => $Title &>
 <& /Elements/Tabs &>
 % }
 
@@ -60,14 +60,11 @@
 <%$Details%>
 </div>
 
-<%cleanup>
-$m->comp('/Elements/Footer');
-$m->abort();
-</%cleanup>
+<& /Elements/Footer &>
+% $m->abort;
 
 <%args>
 $Actions => []
-$Code => undef
 $Details => ''
 $Title => loc("RT Error")
 $Why => loc("the calling component did not specify why"),
@@ -75,13 +72,13 @@ $SuppressHeader => 0,
 </%args>
 
 <%INIT>
-my $error = "WebRT: $Why";
+my $error = $Why;
 $error .= " ($Details)" if defined $Details && length $Details;
 
 $RT::Logger->error( $error );
 
 if ( $session{'REST'} ) {
-    $r->content_type('text/plain');
+    $r->content_type('text/plain; charset=utf-8');
     $m->out( "Error: " . $Why . "\n" );
     $m->out( $Details . "\n" ) if defined $Details && length $Details;
     $m->abort();