X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FController.pm;h=18c825968deb622fdadddf5e6f947652658e80ca;hb=84c28acbcf93fc27a01b9bba70fd2ffdfefe91e1;hp=f52f062f2010c32c178ebdf970d0384e5cc39b73;hpb=38c737272854cbbb86af9ea23d7b5f6c40c2b405;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Controller.pm b/lib/Catalyst/Controller.pm
index f52f062..18c8259 100644
--- a/lib/Catalyst/Controller.pm
+++ b/lib/Catalyst/Controller.pm
@@ -1,13 +1,13 @@
 package Catalyst::Controller;
 
 use Moose;
+use Moose::Util qw/find_meta/;
 
 use namespace::clean -except => 'meta';
 
 # Note - Must be done at compile time due to attributes (::AttrContainer)
 BEGIN { extends qw/Catalyst::Component Catalyst::AttrContainer/; }
 
-use Class::MOP::Object ();
 use Catalyst::Exception;
 use Catalyst::Utils;
 
@@ -181,9 +181,8 @@ sub register_actions {
     my $class = ref $self || $self;
     #this is still not correct for some reason.
     my $namespace = $self->action_namespace($c);
-    my $meta = $self->Class::MOP::Object::meta();
+    my $meta = find_meta($self);
     my %methods = map { $_->body => $_->name }
-        grep { $_->package_name ne 'Moose::Object' } #ignore Moose::Object methods
             $meta->get_all_methods;
 
     # Advanced inheritance support for plugins and the like