fixed JSON rendering bug

mojolicious · Mar 4, 2014 · 80357a5 · 80357a5
1 parent 3ea1eb3
commit 80357a5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/lib/Mojolicious/Renderer.pm b/lib/Mojolicious/Renderer.pm
@@ -98,7 +98,8 @@ sub render {
   }
 
   # JSON
-  elsif (my $json = delete $stash->{json}) {
+  elsif (exists $stash->{json}) {
+    my $json = delete $stash->{json};
     $self->handlers->{json}->($self, $c, \$output, {json => $json});
     return $output, 'json';
   }

diff --git a/t/mojolicious/lite_app.t b/t/mojolicious/lite_app.t
@@ -316,7 +316,9 @@ post '/malformed_utf8' => sub {
 };
 
 get '/json' => sub {
-  shift->render(json => {foo => [1, -2, 3, 'b☃r']}, layout => 'layout');
+  my $self = shift;
+  return $self->render(json => undef) if $self->param('null');
+  $self->render(json => {foo => [1, -2, 3, 'b☃r']}, layout => 'layout');
 };
 
 get '/autostash' => sub { shift->render(handler => 'ep', foo => 'bar') };
@@ -892,6 +894,11 @@ $t->get_ok('/json')->status_is(200)->header_is(Server => 'Mojolicious (Perl)')
   ->json_is('/foo/3', 'b☃r', 'right value')->json_has('/foo')
   ->json_hasnt('/bar');
 
+# JSON ("null")
+$t->get_ok('/json?null=1')->status_is(200)
+  ->header_is(Server => 'Mojolicious (Perl)')
+  ->content_type_is('application/json')->json_is(undef);
+
 # Stash values in template
 $t->get_ok('/autostash?bar=23')->status_is(200)
   ->header_is(Server => 'Mojolicious (Perl)')