Set returnto when redirected to login of a private install (for 0.9.x)

Can't use returnToArgs() because we don't have an action object yet.
This commit is contained in:
Jeffery To 2009-12-17 14:38:14 +08:00 committed by Craig Andrews
parent 8632974131
commit c17d7b671d

View File

@ -278,6 +278,20 @@ function main()
&& !preg_match('/rss$/', $action) && !preg_match('/rss$/', $action)
&& !preg_match('/^Api/', $action) && !preg_match('/^Api/', $action)
) { ) {
// set returnto
$rargs =& common_copy_args($args);
unset($rargs['action']);
if (common_config('site', 'fancy')) {
unset($rargs['p']);
}
if (array_key_exists('submit', $rargs)) {
unset($rargs['submit']);
}
foreach (array_keys($_COOKIE) as $cookie) {
unset($rargs[$cookie]);
}
common_set_returnto(common_local_url($action, $rargs));
common_redirect(common_local_url('login')); common_redirect(common_local_url('login'));
return; return;
} }