The back to site URL in the login message should return the user to the page where they logged in. Fixes bug #11897.

This commit is contained in:
Colin Kuskie 2010-10-05 11:28:01 -07:00
parent adbec05e97
commit ab2be62157
3 changed files with 12 additions and 1 deletions

View file

@ -1066,10 +1066,13 @@ sub showMessageOnLogin {
WebGUI::Macro::process( $self->session, \$output );
# Add the link to continue
my $session = $self->session;
$session->log->warn("returnUrl: >".$self->session->form->get( 'returnUrl' )."<");
$session->log->warn("redirectAfterLoginUrl: >".$self->session->form->get( 'returnUrl' )."<");
my $redirectUrl = $self->session->form->get( 'returnUrl' )
|| $self->session->setting->get("redirectAfterLoginUrl")
|| $self->session->scratch->get( 'redirectAfterLogin' )
|| $self->session->url->getSiteURL . $self->session->url->gateway()
|| $self->session->url->getBackToSiteURL
;
$output .= '<p><a href="' . $redirectUrl . '">' . $i18n->get( 'showMessageOnLogin return' )