continue link from message on login did not look at gateway url

This commit is contained in:
Colin Kuskie 2008-09-04 20:28:35 +00:00
parent 4508fcd1af
commit 58c81ede6d
2 changed files with 4 additions and 1 deletions

View file

@ -20,6 +20,7 @@
- fixed: DataForm Integer value zero does not pass validation - fixed: DataForm Integer value zero does not pass validation
- added: Page range (start-finish) to available paginator text - added: Page range (start-finish) to available paginator text
- rfe: view profile - rfe: view profile
- fixed: Show Message On Login continue link
7.5.22 7.5.22
- fixed: Layout template now gets prepared correctly - fixed: Layout template now gets prepared correctly

View file

@ -895,9 +895,11 @@ sub showMessageOnLogin {
# Add the link to continue # Add the link to continue
my $redirectUrl = $self->session->form->get( 'returnUrl' ) my $redirectUrl = $self->session->form->get( 'returnUrl' )
|| $self->session->scratch->get( 'redirectAfterLogin' ) || $self->session->scratch->get( 'redirectAfterLogin' )
|| $self->session->url->getSiteURL || $self->session->url->getSiteURL . $self->session->url->gateway()
; ;
$self->session->log->warn('getSiteURL='.$self->session->url->getSiteURL);
$self->session->log->warn('scratch='.$self->session->scratch->get( 'redirectAfterLogin' ));
$output .= '<p><a href="' . $redirectUrl . '">' . $i18n->get( 'showMessageOnLogin return' ) $output .= '<p><a href="' . $redirectUrl . '">' . $i18n->get( 'showMessageOnLogin return' )
. '</a></p>' . '</a></p>'
; ;