X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FController.pm;h=aca0b1caf5f18369c06c12cefda4c9bc4fd2ed75;hb=2efad04b4d6590ecf00566d698e94622198909aa;hp=69244057f7773e2478288ef8d6045ebfae592677;hpb=a8f4e833e16a5d2f034afbaf3a94ecdb475ec9cb;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Controller.pm b/lib/Catalyst/Controller.pm
index 6924405..aca0b1c 100644
--- a/lib/Catalyst/Controller.pm
+++ b/lib/Catalyst/Controller.pm
@@ -189,7 +189,7 @@ sub get_action_methods {
     push(
         @methods,
         map {
-            $meta->get_method($_)
+            $meta->find_method_by_name($_)
               || confess( 'Action "' 
                   . $_
                   . '" is not available from controller '
@@ -384,13 +384,14 @@ sub _parse_ChainedParent_attr {
 }
 
 sub _parse_PathPrefix_attr {
-    my $self = shift;
-    return PathPart => $self->path_prefix;
+    my ( $self, $c ) = @_;
+    return PathPart => $self->path_prefix($c);
 }
 
 sub _parse_ActionClass_attr {
     my ( $self, $c, $name, $value ) = @_;
-    $value = Catalyst::Utils::resolve_namespace($self->_action_class, $value);
+    my $appname = $self->_application;
+    $value = Catalyst::Utils::resolve_namespace($appname . '::Action', $self->_action_class, $value);
     return ( 'ActionClass', $value );
 }
 
@@ -487,7 +488,7 @@ Catalyst Contributors, see Catalyst.pm
 
 =head1 COPYRIGHT
 
-This program is free software, you can redistribute it and/or modify
+This library is free software. You can redistribute it and/or modify
 it under the same terms as Perl itself.
 
 =cut