[Jifty-commit] r897 - in jifty/trunk: lib/Jifty share/web/templates/__jifty/error

[jifty-commit at lists.jifty.org]

Author: jesse
Date: Sat Apr 22 18:28:07 2006
New Revision: 897

Modified:
   jifty/trunk/   (props changed)
   jifty/trunk/Makefile.PL
   jifty/trunk/lib/Jifty/Web.pm
   jifty/trunk/share/web/templates/__jifty/error/mason_internal_error

Log:
 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/trunk/Makefile.PL
==============================================================================
--- jifty/trunk/Makefile.PL	(original)
+++ jifty/trunk/Makefile.PL	Sat Apr 22 18:28:07 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/trunk/lib/Jifty/Web.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Web.pm	(original)
+++ jifty/trunk/lib/Jifty/Web.pm	Sat Apr 22 18:28:07 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/trunk/share/web/templates/__jifty/error/mason_internal_error
==============================================================================
--- jifty/trunk/share/web/templates/__jifty/error/mason_internal_error	(original)
+++ jifty/trunk/share/web/templates/__jifty/error/mason_internal_error	Sat Apr 22 18:28:07 2006
@@ -42,12 +42,10 @@
 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;
 }