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

@ -9,6 +9,7 @@
- fixed #11891: Shop credit not displayed in payment method screen
- fixed #11871: Metadata display and criteria builder problems
- fixed #10189: pbworkflow000000000007 Hanging
- fixed #11897: Continue to the site link loses current page
7.10.1
- fixed #11851: Story Topic: top story variables should be available all the time

View file

@ -9,9 +9,16 @@ save you many hours of grief.
7.10.2
--------------------------------------------------------------------
* The URL used by Display Message on Login always returns the user to
the page where they logged in. If your site depended on the old,
buggy behavior of returning the user to the home page after showing
a message, then in the Settings you can assign Redirect After Login Url
to /.
* The UKPLayer - a slideshow that displays images as a movie -
is in WebGUI again. Licencing information was overlooked. An
upgrade to 7.10.1 will break the Matrix. This is fixed now.
7.10.1
--------------------------------------------------------------------
* WebGUI now depends on PerlIO::eol, for doing line ending translation.

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' )