resolve conflict

[catagits/Catalyst-Runtime.git] / lib / Catalyst / Middleware / Stash.pm

diff --git a/lib/Catalyst/Middleware/Stash.pm b/lib/Catalyst/Middleware/Stash.pm
index e31f2d6..f874810 100644 (file)
--- a/lib/Catalyst/Middleware/Stash.pm
+++ b/lib/Catalyst/Middleware/Stash.pm
@@ -43,8 +43,8 @@ sub call {
   my $new_env = +{ %$env };
   my %stash = %{ ($env->{+PSGI_KEY} || sub {})->() || +{} };
 
-  $new_env->{+PSGI_KEY} = _create_stash( \%stash  );
-  return $self->app->($new_env);
+  $env->{+PSGI_KEY} = _create_stash( \%stash  );
+  return $self->app->($env);
 }
 
 =head1 NAME
@@ -58,7 +58,7 @@ directly since it is likely to move off the Catalyst namespace into a stand
 alone distribution
 
 We store a coderef under the C<PSGI_KEY> which can be dereferenced with
-key values or nothing to access the underly hashref.
+key values or nothing to access the underlying hashref.
 
 The stash middleware is designed so that you can 'nest' applications that
 use it.  If for example you have a L<Catalyst> application that is called