projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rt 4.2.16
[freeside.git]
/
rt
/
share
/
html
/
Elements
/
Error
diff --git
a/rt/share/html/Elements/Error
b/rt/share/html/Elements/Error
index
b204261
..
fe25219
100755
(executable)
--- a/
rt/share/html/Elements/Error
+++ b/
rt/share/html/Elements/Error
@@
-2,7
+2,7
@@
%#
%# COPYRIGHT:
%#
%#
%# COPYRIGHT:
%#
-%# This software is Copyright (c) 1996-201
4
Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-201
9
Best Practical Solutions, LLC
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
@@
-48,7
+48,7
@@
% $m->callback( %ARGS, error => $error );
% unless ($SuppressHeader) {
% $m->callback( %ARGS, error => $error );
% unless ($SuppressHeader) {
-<& /Elements/Header,
Code => $Code, Why => $Why,
Title => $Title &>
+<& /Elements/Header, Title => $Title &>
<& /Elements/Tabs &>
% }
<& /Elements/Tabs &>
% }
@@
-60,14
+60,11
@@
<%$Details%>
</div>
<%$Details%>
</div>
-<%cleanup>
-$m->comp('/Elements/Footer');
-$m->abort();
-</%cleanup>
+<& /Elements/Footer &>
+% $m->abort;
<%args>
$Actions => []
<%args>
$Actions => []
-$Code => undef
$Details => ''
$Title => loc("RT Error")
$Why => loc("the calling component did not specify why"),
$Details => ''
$Title => loc("RT Error")
$Why => loc("the calling component did not specify why"),
@@
-75,17
+72,13
@@
$SuppressHeader => 0,
</%args>
<%INIT>
</%args>
<%INIT>
-my $error =
"WebRT: $Why"
;
+my $error =
$Why
;
$error .= " ($Details)" if defined $Details && length $Details;
$error .= " ($Details)" if defined $Details && length $Details;
-# TODO: Log::Dispatch isn't UTF-8 safe. Autrijus needs to talk to dave rolsky about getting this fixed
-use Encode ();
-Encode::_utf8_off($error);
-
-$RT::Logger->error($error);
+$RT::Logger->error( $error );
if ( $session{'REST'} ) {
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();
$m->out( "Error: " . $Why . "\n" );
$m->out( $Details . "\n" ) if defined $Details && length $Details;
$m->abort();