[Jifty-commit] r636 -
jifty-commit at lists.jifty.org
jifty-commit at lists.jifty.org
Mon Feb 27 02:19:23 EST 2006
Author: jesse
Date: Mon Feb 27 02:19:22 2006
New Revision: 636
Modified:
/ (props changed)
jifty/trunk/lib/Jifty/Web.pm
Log:
r24771 at truegrounds: jesse | 2006-02-27 02:13:33 -0500
* Turn back on "the "abort after redirect" behaviour fi we're running in mason
* Improved URL generation to deal with the "redirect with a continuation and handcoded cgi args" case reported by tibbetts.
Modified: jifty/trunk/lib/Jifty/Web.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Web.pm (original)
+++ jifty/trunk/lib/Jifty/Web.pm Mon Feb 27 02:19:22 2006
@@ -647,7 +647,12 @@
response => $self->response,
parent => $self->request->continuation,
);
- $page = $page . "?J:CALL=" . $cont->id;
+ if ($page =~ /\?/) {
+ $page .= "&";
+ } else {
+ $page .= "?";
+ }
+ $page .="J:CALL=" . $cont->id;
}
$self->_redirect($page);
}
@@ -674,7 +679,7 @@
$apache->send_http_header();
# Abort or last_rule out of here
-# $self->mason->abort if $self->mason;
+ $self->mason->abort if $self->mason;
Jifty::Dispatcher::last_rule();
}
More information about the Jifty-commit
mailing list