More disable_component_resolution_regex_fallback

diff --git a/Changes b/Changes
index b6ec42c..cecff5e 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,5 +1,9 @@
 # This file documents the revision history for Perl extension Catalyst.
 
+ Bug fixes:
+  - Fix the disable_component_resolution_regex_fallback config setting
+    to also work in the $c->component method.
+
 5.80032 2011-02-23 01:10:00
 
  Bug fixes:

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index cb908ec..9e41ec6 100644 (file)
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -861,6 +861,9 @@ sub component {
             return $c->_filter_component( $comp, @args ) if $comp;
         }
 
+        return
+            if $c->config->{disable_component_resolution_regex_fallback};
+
         # This is here so $c->comp( '::M::' ) works
         my $query = ref $name ? $name : qr{$name}i;