[Jifty-commit] r2318 - jifty/trunk/lib/Jifty

jifty-commit at lists.jifty.org jifty-commit at lists.jifty.org
Mon Dec 4 05:26:21 EST 2006


Author: dpavlin
Date: Mon Dec  4 05:26:21 2006
New Revision: 2318

Modified:
   jifty/trunk/lib/Jifty/Action.pm

Log:
cleaner way of handling defered values as suggested by Audrey++

Modified: jifty/trunk/lib/Jifty/Action.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Action.pm	(original)
+++ jifty/trunk/lib/Jifty/Action.pm	Mon Dec  4 05:26:21 2006
@@ -982,12 +982,12 @@
     my $type = shift;
 
     my $vv_orig = $self->arguments->{$field}{$type .'_values'};
-    # available are defer { } creates defered value which ref is 0
-    return $vv_orig unless ( ref $vv_orig eq 'ARRAY' || ref $vv_orig eq 0 );
+    local $@;
+    my @values = eval { @$vv_orig } or return $vv_orig;
 
     my $vv = [];
 
-    for my $v (@$vv_orig) {
+    for my $v (@values) {
         if ( ref $v eq 'HASH' ) {
             if ( $v->{'collection'} ) {
                 my $disp = $v->{'display_from'};


More information about the Jifty-commit mailing list