X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=rt%2Fhtml%2FElements%2FError;h=666017f0c0a979a51f49f20bc0a4509e11b29bd5;hp=3aa77a51e1880cf8d2dc6087470700b50f82b59b;hb=75162bb14b3e38d66617077843f4dfdcaf09d5c4;hpb=d39d52aac8f38ea9115628039f0df5aa3ac826de

diff --git a/rt/html/Elements/Error b/rt/html/Elements/Error
index 3aa77a51e..666017f0c 100644
--- a/rt/html/Elements/Error
+++ b/rt/html/Elements/Error
@@ -1,8 +1,8 @@
-%# {{{ BEGIN BPS TAGGED BLOCK
+%# BEGIN BPS TAGGED BLOCK {{{
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -22,7 +22,9 @@
 %# 
 %# You should have received a copy of the GNU General Public License
 %# along with this program; if not, write to the Free Software
-%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+%# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+%# 02110-1301 or visit their web page on the internet at
+%# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
 %# 
 %# 
 %# CONTRIBUTION SUBMISSION POLICY:
@@ -42,24 +44,24 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# }}} END BPS TAGGED BLOCK
+%# END BPS TAGGED BLOCK }}}
 <& /Elements/Callback, %ARGS, error => $error &>
-<& /Elements/Header, Code => $Code, Why => $Why &>
-<& /Elements/Tabs &>
-<& /Elements/TitleBoxStart, class=> "error",  title => $Title &>
+<& /Elements/Header, Code => $Code, Why => $Why, Title => $Title &>
+<& /Elements/Tabs, Title => $Title &>
+<div class="error">
 <%$Why%>
-<br>
-<font size=-1>
+<br />
 <%$Details%>
-</font>
-<& /Elements/TitleBoxEnd &>
-</body>
-</HTML>
+</div>
 
+<%cleanup>
+$m->comp('/Elements/Footer');
+$m->abort();
+</%cleanup>
 
 <%args>
 $Code => undef
-$Details => undef
+$Details =>''
 $Title => loc("RT Error")
 $Why => loc("the calling component did not specify why")
 </%args>
@@ -75,7 +77,7 @@ if ($] >= 5.007001) {
 
 $RT::Logger->error($error);
 
-if ( $session{'SessionType'} eq 'REST' ) {
+if ( defined ($session{'SessionType'}) && $session{'SessionType'} eq 'REST' ) {
     $r->content_type('text/plain');
     $m->out( "Error: " . $Why . "\n" );
     $m->out( $Details . "\n" );