Author: richter
Date: Wed Nov 25 08:07:15 2015
New Revision: 1716318
URL: http://svn.apache.org/viewvc?rev=1716318&view=rev
Log:
Fix coderefs in is_readonly/disable/blank
Modified:
perl/embperl/trunk/Embperl/Form/Control.pm
Modified: perl/embperl/trunk/Embperl/Form/Control.pm
URL:
http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Control.pm?rev=1716318&r1=1716317&r2=1716318&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control.pm Wed Nov 25 08:07:15 2015
@@ -87,10 +87,10 @@ sub is_disabled
{
my ($self, $req) = @_ ;
+ my $ret ;
foreach my $disable ($self -> {disable}, $req ->
{form_options_masks}{$self->{name}}{disable}, $req ->
{form_options_masks}{'*'}{disable})
{
- $disable = &{$disable}($self, $req) if (ref ($disable) eq 'CODE') ;
- return 1 if ($disable) ;
+ return 1 if (ref ($disable) eq 'CODE'?&{$disable}($self,
$req):$disable) ;
}
return ;
@@ -108,8 +108,7 @@ sub is_blanked
foreach my $blank ($self -> {blank}, $req ->
{form_options_masks}{$self->{name}}{blank}, $req ->
{form_options_masks}{'*'}{blank})
{
- $blank = &{$blank}($self, $req) if (ref ($blank) eq 'CODE') ;
- return 1 if ($blank) ;
+ return 1 if (ref ($blank) eq 'CODE'?&{$blank}($self, $req):$blank) ;
}
return ;
}
@@ -126,8 +125,7 @@ sub is_readonly
foreach my $readonly ($self -> {readonly}, $req ->
{form_options_masks}{$self->{name}}{readonly}, $req ->
{form_options_masks}{'*'}{readonly})
{
- $readonly = &{$readonly}($self, $req) if (ref ($readonly) eq 'CODE') ;
- return 1 if ($readonly) ;
+ return 1 if (ref ($readonly) eq 'CODE'?&{$readonly}($self,
$req):$readonly) ;
}
return ;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: embperl-cvs-unsubscr...@perl.apache.org
For additional commands, e-mail: embperl-cvs-h...@perl.apache.org
