[Jifty-commit] r3274 - in Template-Declare: lib/Template/Declare t

[jifty-commit at lists.jifty.org]

Author: jesse
Date: Sun May 20 20:16:13 2007
New Revision: 3274

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

Log:
 r56999 at pinglin:  jesse | 2007-05-20 19:16:38 -0400
 * Be a little bit brighter about whether we should be appending to the TD buffer or returning the content.  Never do both.


Modified: Template-Declare/lib/Template/Declare/Tags.pm
==============================================================================
--- Template-Declare/lib/Template/Declare/Tags.pm	(original)
+++ Template-Declare/lib/Template/Declare/Tags.pm	Sun May 20 20:16:13 2007
@@ -433,7 +433,7 @@
        _show_template( $template, 1 );
         return Template::Declare->buffer->data;
     } else {
-        return show_page( $template);
+        show_page( $template);
     }
 
 }
@@ -449,9 +449,15 @@
     _show_template( $template, 0 );
     my $data = Template::Declare->buffer->data;
     Template::Declare->end_buffer_frame;
-    Template::Declare->buffer->append($data);
     %ELEMENT_ID_CACHE = ();    # We're done. we can clear the cache
+   if (not defined wantarray()) {  
+    
+    Template::Declare->buffer->append($data);
+    return undef;
+     } else {
     return $data;
+
+     }
 }
 
 sub _resolve_relative_template_path {

Modified: Template-Declare/t/closures.t
==============================================================================
--- Template-Declare/t/closures.t	(original)
+++ Template-Declare/t/closures.t	Sun May 20 20:16:13 2007
@@ -85,7 +85,6 @@
 Template::Declare->buffer->clear;
 Template::Declare->show('simple');
 ok(Template::Declare->buffer->data() =~ 'This is my content');
-#diag ($simple);
 ok_lint(Template::Declare->buffer->data());
 }
 

Modified: Template-Declare/t/trivial.t
==============================================================================
--- Template-Declare/t/trivial.t	(original)
+++ Template-Declare/t/trivial.t	Sun May 20 20:16:13 2007
@@ -159,9 +159,7 @@
 }
 {
 Template::Declare->buffer->clear;
-my $ret = Template::Declare->show('simple');
-#diag $ret;
-#diag (Template::Declare->buffer->data());
+ Template::Declare->show('simple');
 ok(Template::Declare->buffer->data() =~ 'This is my content', "show simple filled the buffer");
 #diag ($simple);
 ok_lint(Template::Declare->buffer->data());