[Jifty-commit] r3071 - in Template-Declare: lib/Template/Declare
jifty-commit at lists.jifty.org
jifty-commit at lists.jifty.org
Wed Mar 28 01:51:20 EDT 2007
Author: jesse
Date: Wed Mar 28 01:51:18 2007
New Revision: 3071
Modified:
Template-Declare/ (props changed)
Template-Declare/lib/Template/Declare/Tags.pm
Log:
r54259 at pinglin: jesse | 2007-03-27 22:50:53 -0700
* So sad. this broke live apps
Modified: Template-Declare/lib/Template/Declare/Tags.pm
==============================================================================
--- Template-Declare/lib/Template/Declare/Tags.pm (original)
+++ Template-Declare/lib/Template/Declare/Tags.pm Wed Mar 28 01:51:18 2007
@@ -108,27 +108,8 @@
=cut
-sub outs { _outs(0, @_); }
-
-sub _outs {
- my $raw = shift;
- my @phrases = (@_);
- my $buf;
- Template::Declare->new_buffer_frame;
-
- foreach my $item ( grep {defined} @phrases ) {
- Template::Declare->buffer->append( (ref($item) && $item->isa('Template::Declare::Tag')) ? $item->() : ($raw ? $item: _escape_utf8($item)) );
- }
-
- $buf = Template::Declare->buffer->data;
- Template::Declare->end_buffer_frame;
- if (defined wantarray and not wantarray) {
- return $buf;
- } else {
- Template::Declare->buffer->append($buf);
-
- }
- return '';
+sub outs {
+ outs_raw( map { _escape_utf8($_); } grep {defined} @_ );
}
=head2 outs_raw STUFF
@@ -138,7 +119,8 @@
=cut
sub outs_raw {
- _outs( 1, @_);
+ Template::Declare->buffer->append( join( '', grep {defined} @_ ));
+ return '';
}
@@ -191,13 +173,11 @@
# Scalar context - return a coderef that represents ourselves.
my @__ = @_;
my $_self = $self;
- my $sub =sub {
+ sub {
local $self = $_self;
local *__ANON__ = $tag;
_tag(@__);
};
- bless $sub, 'Template::Declare::Tag';
- return $sub;
} else {
_tag(@_);
}
@@ -343,9 +323,7 @@
local $DEPTH = $DEPTH + 1;
%ATTRIBUTES = ();
Template::Declare->new_buffer_frame;
- my $last = join '', map {
- (ref($_) && $_->isa('Template::Declare::Tag')) ? $_->() : ( ref($_) ? $_ : _escape_utf8($_) )
- } $code->();
+ my $last = join '', map { ref($_) ? $_ : _escape_utf8($_) } $code->();
if ( length(Template::Declare->buffer->data) ) {
@@ -498,22 +476,4 @@
=cut
-package Template::Declare::Tag;
-use overload
- '""' => \&as_string;
-
-sub as_string {
- my $self = shift;
- return $self unless ( wantarray);
- my $buf;
- Template::Declare->new_buffer_frame;
- $self->();
- $buf .= Template::Declare->buffer->data;
- Template::Declare->end_buffer_frame;
-
- return $buf;
-
-}
-
-
1;
More information about the Jifty-commit
mailing list