fixed template inheritance bug in include helper

mojolicious · Oct 28, 2013 · 5896bf9 · 5896bf9
1 parent f43a31d
commit 5896bf9
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/Changes b/Changes
@@ -5,6 +5,7 @@
     longer has any effect. (jberger, sri)
   - Improved form_for performance.
   - Improved built-in templates with documentation search.
+  - Fixed template inheritance bug in include helper.
   - Fixed a few multipart form handling bugs.
 
 4.50  2013-10-22

diff --git a/lib/Mojolicious/Plugin/DefaultHelpers.pm b/lib/Mojolicious/Plugin/DefaultHelpers.pm
@@ -64,8 +64,7 @@ sub _current_route {
 sub _include {
   my $self     = shift;
   my $template = @_ % 2 ? shift : undef;
-  my $args     = {@_};
-  $args->{template} = $template if defined $template;
+  my $args     = {@_, defined $template ? (template => $template) : ()};
 
   # "layout" and "extends" can't be localized
   my $layout  = delete $args->{layout};
@@ -75,7 +74,7 @@ sub _include {
   my @keys = keys %$args;
   local @{$self->stash}{@keys} = @{$args}{@keys};
 
-  return $self->render(partial => 1, layout => $layout, extend => $extends);
+  return $self->render(partial => 1, layout => $layout, extends => $extends);
 }
 
 sub _url_with {

diff --git a/lib/Mojolicious/Renderer.pm b/lib/Mojolicious/Renderer.pm
@@ -53,7 +53,7 @@ sub render {
   my ($self, $c, $args) = @_;
   $args ||= {};
 
-  # Localize "extends" and "layout"
+  # Localize "extends" and "layout" to allow argument overrides
   my $stash = $c->stash;
   local $stash->{layout}  = $stash->{layout}  if exists $stash->{layout};
   local $stash->{extends} = $stash->{extends} if exists $stash->{extends};

diff --git a/t/mojolicious/layouted_lite_app.t b/t/mojolicious/layouted_lite_app.t
@@ -320,18 +320,18 @@ layout_with_template
 Nested <%= include 'outerlayout' %>
 
 @@ localized.html.ep
-% layout 'localized1';
+% extends 'localized1';
 <%= $test %>
-<%= include 'localized_partial', test => 321, layout => 'localized2' %>
+<%= include 'localized_partial', test => 321, extends => 'localized2' %>
 <%= $test %>
 
 @@ localized_partial.html.ep
 <%= $test %>
 
-@@ layouts/localized1.html.ep
+@@ localized1.html.ep
 localized1 <%= content %>
 
-@@ layouts/localized2.html.ep
+@@ localized2.html.ep
 localized2 <%= content %>
 
 @@ outerlayout.html.ep