X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=rt%2Fshare%2Fhtml%2FElements%2FError;h=5ca18386e90213e85cf0c0100315c37430317247;hp=84593735ceb03e25fb2e41247e8f499412f3abc6;hb=919e930aa9279b3c5cd12b593889cd6de79d67bf;hpb=fc6209f398899f0211cfcedeb81a3cd65e04a941 diff --git a/rt/share/html/Elements/Error b/rt/share/html/Elements/Error index 84593735c..5ca18386e 100755 --- a/rt/share/html/Elements/Error +++ b/rt/share/html/Elements/Error @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2015 Best Practical Solutions, LLC %# %# %# (Except where explicitly superseded by other copyright notices) @@ -49,9 +49,11 @@ % unless ($SuppressHeader) { <& /Elements/Header, Code => $Code, Why => $Why, Title => $Title &> -<& /Elements/Tabs, Title => $Title &> +<& /Elements/Tabs &> % } +<& /Elements/ListActions, actions => $Actions &> +
<%$Why%>
@@ -64,6 +66,7 @@ $m->abort(); <%args> +$Actions => [] $Code => undef $Details => '' $Title => loc("RT Error") @@ -75,13 +78,9 @@ $SuppressHeader => 0, my $error = "WebRT: $Why"; $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 ( defined $session{'SessionType'} && $session{'SessionType'} eq 'REST' ) { +if ( $session{'REST'} ) { $r->content_type('text/plain'); $m->out( "Error: " . $Why . "\n" ); $m->out( $Details . "\n" ) if defined $Details && length $Details;