fixed is_public()

git-svn-id: http://svn.maypole.perl.org/Maypole/trunk@208 48953598-375a-da11-a14b-00016c27c3ee

diff --git a/lib/Maypole.pm b/lib/Maypole.pm
index b4e1d623ac3d2276127dd9fb16ef5c00adc2b3e2..6063582201385de9af76e69b9d4ad6a494d39be7 100644 (file)
--- a/lib/Maypole.pm
+++ b/lib/Maypole.pm
@@ -136,7 +136,7 @@ sub is_applicable {
     return DECLINED() unless exists $config->ok_tables->{ $self->{table} };
 
     # Is it public?
-    return DECLINED unless $r->model_class->is_public( $r->{action} );
+    return DECLINED unless $self->model_class->is_public( $self->{action} );
     return OK();
 }
 

diff --git a/lib/Maypole/Model/Base.pm b/lib/Maypole/Model/Base.pm
index b592eaab30f9439d257a2a04df8775c6a504d7e7..b6ef5f4b2156f45ad61bc8ecfca0cfb2b1d3db08 100644 (file)
--- a/lib/Maypole/Model/Base.pm
+++ b/lib/Maypole/Model/Base.pm
@@ -155,13 +155,13 @@ sub description { "A poorly defined class" }
 sub is_public {
     my ( $self, $action ) = @_;
     my $cv = $self->can($action);
-    return DECLINED() unless $cv;
+    return 0 unless $cv;
     my $attrs = join " ", attributes::get($cv);
     do {
         warn "$action not exported" if Maypole->debug;
-        return DECLINED();
+        return 0;
     } unless $attrs =~ /\bExported\b/i;
-    return OK;
+    return 1;
 }
 
 1;