[Jifty-commit] r6975 - in jifty/trunk/lib/Jifty: View/Declare

Mon May 11 14:54:59 EDT 2009

Author: alexmv
Date: Mon May 11 14:54:59 2009
New Revision: 6975

Modified:
   jifty/trunk/lib/Jifty/Plugin/ViewDeclarePage/Page.pm
   jifty/trunk/lib/Jifty/View/Declare/Page.pm

Log:
Change all calls from Template::Declare->(new|end)_buffer_frame to new API

Modified: jifty/trunk/lib/Jifty/Plugin/ViewDeclarePage/Page.pm
==============================================================================

--- jifty/trunk/lib/Jifty/Plugin/ViewDeclarePage/Page.pm	(original)
+++ jifty/trunk/lib/Jifty/Plugin/ViewDeclarePage/Page.pm	Mon May 11 14:54:59 2009
@@ -188,9 +188,9 @@
 sub render {
     my $self = shift;
 
-    Template::Declare->new_buffer_frame;
+    Template::Declare->buffer->push( private => 1 );
     $self->render_body;
-    my $body = Template::Declare->end_buffer_frame->data;
+    my $body = Template::Declare->buffer->pop;
 
     $self->render_header;
 
@@ -390,9 +390,9 @@
             # just in case somebody if somebody put a tag into title
             # tags' code may play with buffers directly
             if ( ref($_) eq 'CODE' ) {
-                Template::Declare->new_buffer_frame;
+                Template::Declare->buffer->push( private => 1);
                 $_->();
-                $res .= Template::Declare->end_buffer_frame->data;
+                $res .= Template::Declare->buffer->pop;
             } else {
                 $res .= $_;
             }
@@ -422,9 +422,9 @@
         return '';
     };
 
-    Template::Declare->new_buffer_frame;
+    Template::Declare->buffer->push( private => 1 );
     $self->render_content;
-    my $content = Template::Declare->end_buffer_frame->data;
+    my $content = Template::Declare->buffer->pop;
 
     unless ( $seen_title ) {
         $self->render_title_inpage;

Modified: jifty/trunk/lib/Jifty/View/Declare/Page.pm
==============================================================================
--- jifty/trunk/lib/Jifty/View/Declare/Page.pm	(original)
+++ jifty/trunk/lib/Jifty/View/Declare/Page.pm	Mon May 11 14:54:59 2009
@@ -66,7 +66,7 @@
     my $self = shift;
     return if $self->done_header;
 
-    Template::Declare->new_buffer_frame;
+    Template::Declare->buffer->push( private => 1 );
     outs_raw(
         '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">' . "\n"
       . '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">' . "\n" );
@@ -141,7 +141,7 @@
         for (@_) {
             no warnings qw( uninitialized );
             if ( ref($_) eq 'CODE' ) {
-                Template::Declare->new_buffer_frame;
+                Template::Declare->buffer->push( private => 1 );
                 $_->();
                 $self->_title(
                     $self->_title . Template::Declare->buffer->pop );
