import rt 3.8.10

[freeside.git] / rt / html / Elements / Error

diff --git a/rt/html/Elements/Error b/rt/html/Elements/Error
index bc5a188..666017f 100644 (file)
--- a/rt/html/Elements/Error
+++ b/rt/html/Elements/Error
@@ -2,7 +2,7 @@
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 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:
@@ -44,15 +46,13 @@
 %# 
 %# 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 &>
+</div>
 
 <%cleanup>
 $m->comp('/Elements/Footer');
@@ -61,7 +61,7 @@ $m->abort();
 
 <%args>
 $Code => undef
-$Details => undef
+$Details =>''
 $Title => loc("RT Error")
 $Why => loc("the calling component did not specify why")
 </%args>
@@ -77,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" );