small optimizations

mojolicious · Jun 18, 2013 · 94f74da · 94f74da
1 parent 5f13e39
commit 94f74da
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/Changes b/Changes
@@ -1,4 +1,6 @@
 
+4.16  2013-06-19
+
 4.15  2013-06-18
   - Added around_action hook.
   - Improved ojo to make the current controller object available to actions

diff --git a/lib/Mojolicious.pm b/lib/Mojolicious.pm
@@ -41,7 +41,7 @@ has static   => sub { Mojolicious::Static->new };
 has types    => sub { Mojolicious::Types->new };
 
 our $CODENAME = 'Top Hat';
-our $VERSION  = '4.15';
+our $VERSION  = '4.16';
 
 sub AUTOLOAD {
   my $self = shift;

diff --git a/lib/Mojolicious/Routes.pm b/lib/Mojolicious/Routes.pm
@@ -93,11 +93,11 @@ sub _add {
 }
 
 sub _callback {
-  my ($self, $c, $field, $nested) = @_;
+  my ($self, $c, $field, $last) = @_;
   $c->stash->{'mojo.routed'}++;
   my $app = $c->app;
   $app->log->debug('Routing to a callback.');
-  return _action($app, $c, $field->{cb}, $nested) || $nested;
+  return _action($app, $c, $field->{cb}, $last);
 }
 
 sub _class {
@@ -141,7 +141,7 @@ sub _class {
 }
 
 sub _controller {
-  my ($self, $old, $field, $nested) = @_;
+  my ($self, $old, $field, $last) = @_;
 
   # Load and instantiate controller/application
   my $new;
@@ -169,16 +169,16 @@ sub _controller {
       $log->debug(qq{Routing to controller "$class" and action "$method".});
 
       if (my $sub = $new->can($method)) {
-        $old->stash->{'mojo.routed'}++ if $nested;
-        return 1 if _action($app, $new, $sub, $nested);
+        $old->stash->{'mojo.routed'}++ if $last;
+        return 1 if _action($app, $new, $sub, $last);
       }
 
       else { $log->debug('Action not found in controller.') }
     }
     else { $log->debug(qq{Action "$method" is not allowed.}) }
   }
 
-  return $nested;
+  return undef;
 }
 
 sub _load {