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

[Jifty commits]

Author: alexmv
Date: Tue Jan  6 17:57:32 2009
New Revision: 6201

Modified:
   jifty/trunk/   (props changed)
   jifty/trunk/lib/Jifty/View/Declare/Helpers.pm

Log:
 r40353 at kohr-ah:  chmrr | 2009-01-06 16:58:07 -0500
  * "page" can be called inside a custom sub, which should DTRT


Modified: jifty/trunk/lib/Jifty/View/Declare/Helpers.pm
==============================================================================
--- jifty/trunk/lib/Jifty/View/Declare/Helpers.pm	(original)
+++ jifty/trunk/lib/Jifty/View/Declare/Helpers.pm	Tue Jan  6 17:57:32 2009
@@ -97,7 +97,7 @@
 sub page (&;$) {
     unshift @_, undef if $#_ == 0;
     my ( $meta, $code ) = @_;
-    sub {
+    my $ret = sub {
         my $self = shift;
         Jifty->handler->apache->content_type('text/html; charset=utf-8');
         my $wrapper = Jifty->app_class('View')->can('wrapper') || \&wrapper;
@@ -105,7 +105,9 @@
         my $metadata = $#metadata == 0 ? $metadata[0] : {@metadata};
         local *is::title = sub { Carp::carp "Can't use 'title is' when mixing mason and TD" };
         $wrapper->( sub { $code->( $self, $metadata ) }, $metadata );
-    }
+    };
+    $ret->() unless defined wantarray;
+    return $ret;
 }
 
 =head3 content