fixed small bug in Mojolicious::Plugin::EPRenderer that prevented cod…

…e to be added to all templates
mojolicious · Jul 12, 2012 · e585f5d · e585f5d
1 parent 694a3c9
commit e585f5d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/Changes b/Changes
@@ -1,4 +1,8 @@
 
+3.07  2012-07-12
+  - Fixed small bug in Mojolicious::Plugin::EPRenderer that prevented code to
+    be added to all templates.
+
 3.06  2012-07-11
   - Added tls_verify option to Mojo::IOLoop::Server->listen. (scottw)
   - Added verify parameter to Mojo::Server::Daemon->listen. (scottw)

diff --git a/lib/Mojolicious.pm b/lib/Mojolicious.pm
@@ -34,7 +34,7 @@ has static   => sub { Mojolicious::Static->new };
 has types    => sub { Mojolicious::Types->new };
 
 our $CODENAME = 'Rainbow';
-our $VERSION  = '3.06';
+our $VERSION  = '3.07';
 
 # "These old doomsday devices are dangerously unstable.
 #  I'll rest easier not knowing where they are."

diff --git a/lib/Mojolicious/Plugin/EPRenderer.pm b/lib/Mojolicious/Plugin/EPRenderer.pm
@@ -47,7 +47,7 @@ sub register {
           for grep {/^\w+$/} keys %{$c->stash};
 
         # Cache
-        $cache->set($key => $mt->prepend($prepend));
+        $cache->set($key => $mt->prepend($mt->prepend . $prepend));
       }
 
       # Render with "epl" handler

diff --git a/t/mojolicious/twinkle_lite_app.t b/t/mojolicious/twinkle_lite_app.t
@@ -25,6 +25,7 @@ my $twinkle = {
   escape_mark     => '*',
   expression_mark => '*',
   line_start      => '.',
+  prepend         => 'no warnings "redefine"; sub bar { "bar!" }',
   tag_end         => '**',
   tag_start       => '**',
   trim_mark       => '*'
@@ -69,7 +70,8 @@ get '/dead' => sub {die};
 my $t = Test::Mojo->new;
 
 # GET /
-$t->get_ok('/')->status_is(200)->content_like(qr/testHello <sebastian>!123/);
+$t->get_ok('/')->status_is(200)
+  ->content_like(qr/testHello <sebastian>!bar!123/);
 
 # GET /advanced
 $t->get_ok('/advanced')->status_is(200)
@@ -100,6 +102,7 @@ __DATA__
 @@ index.foo.twinkle
 . layout 'twinkle';
 Hello *** $name **!\
+*** bar **\
 
 @@ layouts/twinkle.foo.ep
 test<%= content %>123\