[Jifty-commit] r695 - in jifty/trunk: lib/Jifty/Mason share/web/templates/__jifty

[jifty-commit at lists.jifty.org]

Author: alexmv
Date: Thu Mar 16 18:06:31 2006
New Revision: 695

Modified:
   jifty/trunk/   (props changed)
   jifty/trunk/lib/Jifty/Mason/Halo.pm
   jifty/trunk/share/web/templates/__jifty/halo

Log:
 r8594 at zoq-fot-pik:  chmrr | 2006-03-16 18:01:42 -0500
  * Remove a couple warnings


Modified: jifty/trunk/lib/Jifty/Mason/Halo.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Mason/Halo.pm	(original)
+++ jifty/trunk/lib/Jifty/Mason/Halo.pm	Thu Mar 16 18:06:31 2006
@@ -45,7 +45,7 @@
 
     push @$STACK, {
         id           => $halo_base,
-        args         => [map { eval { fileno( $_ ) }  ? "*GLOB*" : $_} @{$context->args}],
+        args         => [map { eval { defined $_ and fileno( $_ ) }  ? "*GLOB*" : $_} @{$context->args}],
         start_time   => Time::HiRes::time(),
         path         => $context->comp->path,
         subcomponent => (  $context->comp->is_subcomp() ? 1:0),

Modified: jifty/trunk/share/web/templates/__jifty/halo
==============================================================================
--- jifty/trunk/share/web/templates/__jifty/halo	(original)
+++ jifty/trunk/share/web/templates/__jifty/halo	Thu Mar 16 18:06:31 2006
@@ -113,7 +113,7 @@
 <li>
 <span class="fixed"><% $_->[1] %></span><br />
 % if (@{$_->[2]}) {
-<b>Bindings:</b> <tt><% join(',', @{$_->[2]}) %></tt><br />
+<b>Bindings:</b> <tt><% join(',', map {defined $_ ? $_ : "undef"} @{$_->[2]}) %></tt><br />
 % }
 <i><% $_->[3] %> seconds</i>
 </li>