projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
import rt 3.8.10
[freeside.git]
/
rt
/
html
/
Elements
/
Error
diff --git
a/rt/html/Elements/Error
b/rt/html/Elements/Error
index
3aa77a5
..
666017f
100644
(file)
--- a/
rt/html/Elements/Error
+++ b/
rt/html/Elements/Error
@@
-1,8
+1,8
@@
-%#
{{{ BEGIN BPS TAGGED BLOCK
+%#
BEGIN BPS TAGGED BLOCK {{{
%#
%# COPYRIGHT:
%#
%#
%# COPYRIGHT:
%#
-%# This software is Copyright (c) 1996-200
4
Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-200
9
Best Practical Solutions, LLC
%# <jesse@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
%# <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
%#
%# 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:
%#
%#
%# CONTRIBUTION SUBMISSION POLICY:
@@
-42,24
+44,24
@@
%# works based on those contributions, and sublicense and distribute
%# those contributions and any derivatives thereof.
%#
%# 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/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%>
<%$Why%>
-<br>
-<font size=-1>
+<br />
<%$Details%>
<%$Details%>
-</font>
-<& /Elements/TitleBoxEnd &>
-</body>
-</HTML>
+</div>
+<%cleanup>
+$m->comp('/Elements/Footer');
+$m->abort();
+</%cleanup>
<%args>
$Code => undef
<%args>
$Code => undef
-$Details =>
undef
+$Details =>
''
$Title => loc("RT Error")
$Why => loc("the calling component did not specify why")
</%args>
$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);
$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" );
$r->content_type('text/plain');
$m->out( "Error: " . $Why . "\n" );
$m->out( $Details . "\n" );