X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FDispatcher.pm;h=d9fe5b3bf41f622eea0bee314e5a8c124b00e198;hb=717fc5c90d2cbbd6288bae9be82dbd8f6b917bab;hp=dc5259443248a86df9c4d51292cd91c81b92dbbf;hpb=f294a3c9b2c3390b7c3b4cec10161e8b355f9520;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst/Dispatcher.pm b/lib/Catalyst/Dispatcher.pm index dc52594..d9fe5b3 100644 --- a/lib/Catalyst/Dispatcher.pm +++ b/lib/Catalyst/Dispatcher.pm @@ -518,7 +518,7 @@ sub register { # we eat exceptions loading dispatch types. eval { Class::MOP::load_class($class) }; my $load_failed = $@; - $self->_check_depreciated_dispatch_type( $key, $load_failed ); + $self->_check_deprecated_dispatch_type( $key, $load_failed ); push( @{ $self->dispatch_types }, $class->new ) unless $load_failed; $registered->{$class} = 1; } @@ -691,7 +691,7 @@ sub dispatch_type { return undef; } -sub _check_depreciated_dispatch_type { +sub _check_deprecated_dispatch_type { my ($self, $key, $load_failed) = @_; return unless $key =~ /^(Local)?Regexp?/; @@ -702,12 +702,12 @@ sub _check_depreciated_dispatch_type { . " Use Chained methods or install the standalone\n" . " Catalyst::DispatchType::Regex if necessary.\n" ); } elsif ( !defined $Catalyst::DispatchType::Regex::VERSION - || $Catalyst::DispatchType::Regex::VERSION <= 5.90020 ) { + || $Catalyst::DispatchType::Regex::VERSION le '5.90020' ) { # We loaded the old core version of the Regex module this will break warn( "The $key DispatchType has been removed from Catalyst core.\n" . " An old version of the core Catalyst::DispatchType::Regex\n" . " has been loaded and will likely fail. Please remove\n" - . " $INC{'Catalyst::DispatchType::Regex'}\n" + . " $INC{'Catalyst/DispatchType/Regex.pm'}\n" . " and use Chained methods or install the standalone\n" . " Catalyst::DispatchType::Regex if necessary.\n" ); }