Skip to content

Commit

Permalink
Merge branch 'master' into test_mojo_attr
Browse files Browse the repository at this point in the history
  • Loading branch information
kraih authored Nov 2, 2020
2 parents 5b04b8c + 34a9c4e commit 65e0d3d
Show file tree
Hide file tree
Showing 5 changed files with 373 additions and 211 deletions.
2 changes: 1 addition & 1 deletion Changes
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

8.64 2020-10-26
8.64 2020-11-01
- Replaced prettify.js with highlight.js. (zakame)
- Fixed a bug in Mojo::DOM where the tree root would be checked for all pseudo-classes.
- Fixed a redefined subroutine warning in eval command. (elmar)
Expand Down
5 changes: 2 additions & 3 deletions lib/Mojolicious/Routes.pm
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ use Mojo::Cache;
use Mojo::DynamicMethods;
use Mojo::Loader qw(load_class);
use Mojo::Util qw(camelize);
use Mojolicious::Routes::Match;

has base_classes => sub { [qw(Mojolicious::Controller Mojolicious)] };
has cache => sub { Mojo::Cache->new };
Expand Down Expand Up @@ -81,8 +80,8 @@ sub match {

# Check cache
my $ws = $c->tx->is_websocket ? 1 : 0;
my $match = Mojolicious::Routes::Match->new(root => $self);
$c->match($match);
my $match = $c->match;
$match->root($self);
my $cache = $self->cache;
if (my $result = $cache->get("$method:$path:$ws")) {
return $match->endpoint($result->{endpoint})->stack($result->{stack});
Expand Down
Loading

0 comments on commit 65e0d3d

Please sign in to comment.