[Jifty-commit] jifty branch, master, updated. 4f64d90ea93136029b947da74e487dd73540f646

Jifty commits jifty-commit at lists.jifty.org
Wed Jan 13 17:21:34 EST 2010


The branch, master has been updated
       via  4f64d90ea93136029b947da74e487dd73540f646 (commit)
      from  508c4c5e390ab069b250e9b3ef2faf64afffe247 (commit)

Summary of changes:
 lib/Jifty/Web/Form/Field.pm |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

- Log -----------------------------------------------------------------
commit 4f64d90ea93136029b947da74e487dd73540f646
Author: Shawn M Moore <sartak at bestpractical.com>
Date:   Wed Jan 13 17:21:13 2010 -0500

    Give a better error when available_values isn't an arrayref

diff --git a/lib/Jifty/Web/Form/Field.pm b/lib/Jifty/Web/Form/Field.pm
index e8e8d5c..5583a6e 100644
--- a/lib/Jifty/Web/Form/Field.pm
+++ b/lib/Jifty/Web/Form/Field.pm
@@ -852,7 +852,13 @@ sub available_values {
     }
 
     # Otherwise consult the action
-    return @{ $self->action->available_values($self->name) };
+
+    my $values =  $self->action->available_values($self->name);
+    if (!ref($values) || ref($values) ne 'ARRAY') {
+        die "available_values of parameter '" . $self->name . "' returned a " . (ref($values) || 'nonreference') . ", expected array reference";
+    }
+
+    return @$values;
 }
 
 =for private

-----------------------------------------------------------------------


More information about the Jifty-commit mailing list