X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst.pm;h=fd007937863cb289f2f075ee429228945155839a;hb=a1a8d97d78aa20cea4fd5b7ffb22e5255f817e0c;hp=d7b53ae16cec4184939372519f458f0b31ca34fb;hpb=8641855930b874893d1a898a552799f999a2084a;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index d7b53ae..fd00793 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -12,13 +12,13 @@ use Catalyst::Utils;
 use Catalyst::Controller;
 use Devel::InnerPackage ();
 use File::stat;
-use Module::Pluggable::Object;
+use Module::Pluggable::Object ();
 use NEXT;
-use Text::SimpleTable;
-use Path::Class::Dir;
-use Path::Class::File;
+use Text::SimpleTable ();
+use Path::Class::Dir ();
+use Path::Class::File ();
 use Time::HiRes qw/gettimeofday tv_interval/;
-use URI;
+use URI ();
 use Scalar::Util qw/weaken blessed/;
 use Tree::Simple qw/use_weak_refs/;
 use Tree::Simple::Visitor::FindByUID;
@@ -61,7 +61,7 @@ __PACKAGE__->response_class('Catalyst::Response');
 
 # Remember to update this in Catalyst::Runtime as well!
 
-our $VERSION = '5.70_03';
+our $VERSION = '5.7000';
 
 sub import {
     my ( $class, @arguments ) = @_;
@@ -860,8 +860,8 @@ EOF
 
 =head2 $c->uri_for( $path, @args?, \%query_values? )
 
-Merges path with C<$c-E<gt>request-E<gt>base> for absolute URIs and with
-C<$c-E<gt>namespace> for relative URIs, then returns a normalized L<URI>
+Merges path with C<< $c->request->base >> for absolute URIs and with
+C<< $c->namespace >> for relative URIs, then returns a normalized L<URI>
 object. If any args are passed, they are added at the end of the path.
 If the last argument to C<uri_for> is a hash reference, it is assumed to
 contain GET parameter key/value pairs, which will be appended to the URI
@@ -869,7 +869,7 @@ in standard fashion.
 
 Instead of C<$path>, you can also optionally pass a C<$action> object
 which will be resolved to a path using
-C<$c-E<gt>dispatcher-E<gt>uri_for_action>; if the first element of
+C<< $c->dispatcher->uri_for_action .>; if the first element of
 C<@args> is an arrayref it is treated as a list of captures to be passed
 to C<uri_for_action>.
 
@@ -1129,7 +1129,7 @@ sub execute {
 
     if ( $c->depth >= $RECURSION ) {
         my $action = "$code";
-        $action = "/$action" unless $action =~ /\-\>/;
+        $action = "/$action" unless $action =~ /->/;
         my $error = qq/Deep recursion detected calling "$action"/;
         $c->log->error($error);
         $c->error($error);
@@ -1151,6 +1151,7 @@ sub execute {
         if ( $error eq $DETACH ) { die $DETACH if $c->depth > 1 }
         else {
             unless ( ref $error ) {
+                no warnings 'uninitialized';
                 chomp $error;
                 my $class = $last->class;
                 my $name  = $last->name;