[Jifty-commit] r5095 - in jifty/trunk: lib/Jifty lib/Jifty/View/Declare lib/Jifty/View/Mason
Jifty commits
jifty-commit at lists.jifty.org
Mon Feb 11 15:47:17 EST 2008
Author: alexmv
Date: Mon Feb 11 15:47:07 2008
New Revision: 5095
Modified:
jifty/trunk/ (props changed)
jifty/trunk/lib/Jifty/Request.pm
jifty/trunk/lib/Jifty/View/Declare/Handler.pm
jifty/trunk/lib/Jifty/View/Mason/Handler.pm
Log:
r27753 at zoq-fot-pik: chmrr | 2008-02-11 15:46:40 -0500
* Old requests from continuations may not have template_arguments set
Modified: jifty/trunk/lib/Jifty/Request.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Request.pm (original)
+++ jifty/trunk/lib/Jifty/Request.pm Mon Feb 11 15:47:07 2008
@@ -373,6 +373,7 @@
my $self = shift;
my $key = shift;
+ $self->template_arguments({}) unless $self->template_arguments;
if (@_) {
my $value = shift;
$self->template_arguments->{$key} = $value;
@@ -392,6 +393,7 @@
my $self = shift;
my $key = shift;
+ $self->template_arguments({}) unless $self->template_arguments;
if (exists $self->template_arguments->{$key}) {
delete $self->template_arguments->{$key};
return;
Modified: jifty/trunk/lib/Jifty/View/Declare/Handler.pm
==============================================================================
--- jifty/trunk/lib/Jifty/View/Declare/Handler.pm (original)
+++ jifty/trunk/lib/Jifty/View/Declare/Handler.pm Mon Feb 11 15:47:07 2008
@@ -75,7 +75,7 @@
goto &Template::Declare::Tags::outs_raw;
};
- my $content = Template::Declare::Tags::show_page( $template, { %{Jifty->web->request->arguments}, %{Jifty->web->request->template_arguments} } );
+ my $content = Template::Declare::Tags::show_page( $template, { %{Jifty->web->request->arguments}, %{Jifty->web->request->template_arguments || {}} } );
return unless defined $content;
my $r = Jifty->handler->apache;
Modified: jifty/trunk/lib/Jifty/View/Mason/Handler.pm
==============================================================================
--- jifty/trunk/lib/Jifty/View/Mason/Handler.pm (original)
+++ jifty/trunk/lib/Jifty/View/Mason/Handler.pm Mon Feb 11 15:47:07 2008
@@ -231,7 +231,7 @@
=cut
sub request_args {
- return %{Jifty->web->request->arguments}, %{Jifty->web->request->template_arguments};
+ return %{Jifty->web->request->arguments}, %{Jifty->web->request->template_arguments || {}};
}
###########################################################
More information about the Jifty-commit
mailing list