consistently check for non-whitespace characters

mojolicious · Feb 28, 2016 · 24e76c0 · 24e76c0
1 parent c64d4cc
commit 24e76c0
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/Mojolicious/Renderer.pm b/lib/Mojolicious/Renderer.pm
@@ -126,13 +126,13 @@ sub render {
 
   # Inheritance
   my $content = $stash->{'mojo.content'} ||= {};
-  local $content->{content} = $output if $stash->{extends} || $stash->{layout};
+  local $content->{content} = $output =~ /\S/ ? $output : undef
+    if $stash->{extends} || $stash->{layout};
   while ((my $next = _next($stash)) && !defined $inline) {
     @$options{qw(handler template)} = ($stash->{handler}, $next);
     $options->{format} = $stash->{format} || $self->default_format;
     if ($self->_render_template($c, \my $tmp, $options)) { $output = $tmp }
-    $content->{content} = $output
-      if $content->{content} !~ /\S/ && $output =~ /\S/;
+    $content->{content} //= $output if $output =~ /\S/;
   }
 
   # Encoding