[Jifty-commit] r3076 - in Template-Declare: lib/Template/Declare

jifty-commit at lists.jifty.org jifty-commit at lists.jifty.org
Sat Mar 31 21:49:36 EDT 2007


Author: jesse
Date: Sat Mar 31 21:49:35 2007
New Revision: 3076

Modified:
   Template-Declare/   (props changed)
   Template-Declare/lib/Template/Declare/Tags.pm

Log:
 r54399 at pinglin:  jesse | 2007-03-31 18:49:21 -0700
  * This broke nav menus on live. i suck


Modified: Template-Declare/lib/Template/Declare/Tags.pm
==============================================================================
--- Template-Declare/lib/Template/Declare/Tags.pm	(original)
+++ Template-Declare/lib/Template/Declare/Tags.pm	Sat Mar 31 21:49:35 2007
@@ -130,18 +130,24 @@
     Template::Declare->new_buffer_frame;
 
     foreach my $item ( grep {defined} @phrases ) {
+
         Template::Declare->new_buffer_frame;
-        my $returned = ref($item) eq 'Template::Declare::Tag' ? $item->()
-            : ( $raw ? $item : _escape_utf8($item) ) || '';
-        $returned .= Template::Declare->buffer->data || '';
+        my $returned = ref($item) eq 'CODE'
+            ? $item->()
+            : ( $raw ? $item : _escape_utf8($item) ) ||'';
+        my $content = Template::Declare->buffer->data ||'';
         Template::Declare->end_buffer_frame;
-        Template::Declare->buffer->append(  $returned );
+        Template::Declare->buffer->append( $content . $returned );
     }
 
-    $buf = Template::Declare->buffer->data || '';
+    $buf = Template::Declare->buffer->data ||'';
     Template::Declare->end_buffer_frame;
-    if ( defined wantarray and not wantarray ) { return $buf; }
-    else { Template::Declare->buffer->append($buf); }
+    if ( defined wantarray and not wantarray ) {
+        return $buf;
+    } else {
+        Template::Declare->buffer->append($buf);
+
+    }
     return '';
 }
 


More information about the Jifty-commit mailing list