[Jifty-commit] r901 - in jifty/branches/jifty-jsan: .
share/web/templates/__jifty/error
jifty-commit at lists.jifty.org
jifty-commit at lists.jifty.org
Sun Apr 23 12:16:53 EDT 2006
Author: trs
Date: Sun Apr 23 12:16:53 2006
New Revision: 901
Modified:
jifty/branches/jifty-jsan/ (props changed)
jifty/branches/jifty-jsan/Makefile.PL
jifty/branches/jifty-jsan/lib/Jifty/Web.pm
jifty/branches/jifty-jsan/share/web/templates/__jifty/error/mason_internal_error
Log:
r9948 at zot (orig r896): jesse | 2006-04-22 18:27:59 -0400
r11785 at hualien: jesse | 2006-04-22 18:15:55 -0400
* The error page wasn't doing the right thing when devel mode was off. (parameters were out of order).
r9949 at zot (orig r897): jesse | 2006-04-22 18:28:07 -0400
r11786 at hualien: jesse | 2006-04-22 18:20:20 -0400
* It's not nice when we try to run methods on undef
Modified: jifty/branches/jifty-jsan/Makefile.PL
==============================================================================
--- jifty/branches/jifty-jsan/Makefile.PL (original)
+++ jifty/branches/jifty-jsan/Makefile.PL Sun Apr 23 12:16:53 2006
@@ -1,6 +1,6 @@
use inc::Module::Install 0.46;
name('Jifty');
-
+license('Perl');
# this is a dev version, CPAN.pm will not install by default
requires(perl => '5.8.3');
requires('Apache::Session');
Modified: jifty/branches/jifty-jsan/lib/Jifty/Web.pm
==============================================================================
--- jifty/branches/jifty-jsan/lib/Jifty/Web.pm (original)
+++ jifty/branches/jifty-jsan/lib/Jifty/Web.pm Sun Apr 23 12:16:53 2006
@@ -744,7 +744,7 @@
my @monikers = ($only_moniker) || sort keys %results;
for my $type (qw(error message)) {
- next unless grep { $results{$_}->$type() } @monikers;
+ next unless grep { defined $results{$_} and $results{$_}->$type() } @monikers;
my $plural = $type . "s";
$self->out(qq{<div id="$plural">});
Modified: jifty/branches/jifty-jsan/share/web/templates/__jifty/error/mason_internal_error
==============================================================================
--- jifty/branches/jifty-jsan/share/web/templates/__jifty/error/mason_internal_error (original)
+++ jifty/branches/jifty-jsan/share/web/templates/__jifty/error/mason_internal_error Sun Apr 23 12:16:53 2006
@@ -35,22 +35,27 @@
my $cont = Jifty->web->request->continuation;
$wrapper = "/__jifty/error/_elements/wrapper"
- if $cont and $cont->request->path eq "/__jifty/error/mason_internal_error";
+ if $cont
+ and $cont->request->path eq "/__jifty/error/mason_internal_error";
# If we're not in devel, bail
-if (not Jifty->config->framework("DevelMode") or not $cont) {
- $m->comp({content => sub {
- $m->comp("_elements/error_text", error => "mason internal error");
- }, $wrapper, title => "Something went awry"});
- $m->abort;
+if ( not Jifty->config->framework("DevelMode") or not $cont ) {
+ $m->comp(
+ $wrapper,
+ content => sub {
+ $m->comp( "_elements/error_text", error => "mason internal error" );
+ },
+ title => "Something went awry"
+ );
+ $m->abort;
}
-my $e = $cont->response->error;
+my $e = $cont->response->error;
my $msg = $e->message;
$msg =~ s/, <\S+> (line|chunk) \d+\././;
-my $info = $e->analyze_error;
-my $file = $info->{file};
-my @lines = @{$info->{lines}};
-my @stack = @{$info->{frames}};
-</%init>
\ No newline at end of file
+my $info = $e->analyze_error;
+my $file = $info->{file};
+my @lines = @{ $info->{lines} };
+my @stack = @{ $info->{frames} };
+</%init>
More information about the Jifty-commit
mailing list