X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FController.pm;fp=lib%2FCatalyst%2FController.pm;h=8e73316bc35c690e2fb0f4c48e3ab6dfbd5a56f9;hb=4b16d376546ea9e4ee0ca6331a8af83bdd07e8e3;hp=39ca9f75919475cdd11cc50f3e4bfec9cfac4f4e;hpb=cb689891b91e9343d8d3784908f73d68b9933e05;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst/Controller.pm b/lib/Catalyst/Controller.pm index 39ca9f7..8e73316 100644 --- a/lib/Catalyst/Controller.pm +++ b/lib/Catalyst/Controller.pm @@ -138,29 +138,13 @@ around action_namespace => sub { my ( $self, $c ) = @_; my $class = ref($self) || $self; - my $appclass = ref($c) || $c; if( ref($self) ){ return $self->$orig if $self->has_action_namespace; } else { return $class->config->{namespace} if exists $class->config->{namespace}; } - my $case_s; - if( $c ){ - $case_s = $c->config->{case_sensitive}; - } else { - if ($self->isa('Catalyst')) { - $case_s = $class->config->{case_sensitive}; - } else { - if (ref $self) { - $case_s = ref($self->_application)->config->{case_sensitive}; - } else { - confess("Can't figure out case_sensitive setting"); - } - } - } - - my $namespace = Catalyst::Utils::class2prefix($self->catalyst_component_name, $case_s) || ''; + my $namespace = Catalyst::Utils::class2prefix($self->catalyst_component_name) || ''; $self->$orig($namespace) if ref($self); return $namespace; };