[Jifty-commit] r6576 - in jifty/trunk: lib/Jifty/View/Mason lib/Jifty/View/Static

[Jifty commits]

Author: alexmv
Date: Tue Mar 10 15:19:07 2009
New Revision: 6576

Modified:
   jifty/trunk/   (props changed)
   jifty/trunk/lib/Jifty/View/Mason/Handler.pm
   jifty/trunk/lib/Jifty/View/Static/Handler.pm

Log:
 r43097 at kohr-ah:  chmrr | 2009-03-10 15:18:40 -0400
 Small warnings cleanups for undef template_root and static_roots


Modified: jifty/trunk/lib/Jifty/View/Mason/Handler.pm
==============================================================================
--- jifty/trunk/lib/Jifty/View/Mason/Handler.pm	(original)
+++ jifty/trunk/lib/Jifty/View/Mason/Handler.pm	Tue Mar 10 15:19:07 2009
@@ -105,7 +105,7 @@
     my %seen; $seen{$_} = 1 for map Jifty->config->framework('Web')->{$_}, qw/TemplateRoot DefaultTemplateRoot/;
     for my $plugin (Jifty->plugins) {
         my $comp_root = $plugin->template_root;
-        next unless  ( $comp_root and -d $comp_root and not $seen{$comp_root}++);
+        next unless ( defined $comp_root and -d $comp_root and not $seen{$comp_root}++);
         $plugin->log->debug( "Plugin @{[ref($plugin)]} mason component root added: (@{[$comp_root ||'']})");
         push @{ $config{comp_root} }, [ ref($plugin)."-". $root_serial++ => $comp_root ];
     }

Modified: jifty/trunk/lib/Jifty/View/Static/Handler.pm
==============================================================================
--- jifty/trunk/lib/Jifty/View/Static/Handler.pm	(original)
+++ jifty/trunk/lib/Jifty/View/Static/Handler.pm	Tue Mar 10 15:19:07 2009
@@ -50,7 +50,7 @@
     my %seen; $seen{$_} = 1 for map Jifty->config->framework('Web')->{$_}, qw/StaticRoot DefaultStaticRoot/;
     for my $plugin ( Jifty->plugins ) {
         my $root = $plugin->static_root;
-        next unless ( -d $root and -r $root and not $seen{$root}++);
+        next unless ( defined $root and -d $root and -r $root and not $seen{$root}++);
         push @roots, $root;
         $plugin->log->debug( "Plugin @{[ref($plugin)]} static root added: (@{[$root ||'']})");
     }