From: <de...@de...> - 2006-05-30 10:21:47
|
Author: SteffenPoulsen Date: 2006-05-29 22:42:13 -0500 (Mon, 29 May 2006) New Revision: 10386 Modified: twiki/branches/TWikiRelease04x00/lib/TWiki/Client.pm twiki/branches/TWikiRelease04x00/lib/TWiki/Client/TemplateLogin.pm Log: Item2380: Workaround for correct login functionality with I18N topic names Modified: twiki/branches/TWikiRelease04x00/lib/TWiki/Client/TemplateLogin.pm =================================================================== --- twiki/branches/TWikiRelease04x00/lib/TWiki/Client/TemplateLogin.pm 2006-05-30 00:28:59 UTC (rev 10385) +++ twiki/branches/TWikiRelease04x00/lib/TWiki/Client/TemplateLogin.pm 2006-05-30 03:42:13 UTC (rev 10386) @@ -56,7 +56,7 @@ unless( $twiki->inContext( 'authenticated' )) { my $query = $twiki->{cgiQuery}; # SMELL CGI::url drops the anchor. Report as bug against CGI::? - $query->param( origurl => $query->url( -path => 1, -query => 1 )); + $query->param( origurl => $ENV{REQUEST_URI} ); $this->login( $query, $twiki ); return 1; } @@ -71,8 +71,7 @@ my $web = $twiki->{webName}; my $query = $twiki->{cgiQuery}; return $twiki->getScriptUrl( 0, 'login', $web, $topic, - origurl => $query->url( -path => 1, - -query => 1 ), @_ ); + origurl => $ENV{REQUEST_URI} ); } =pod Modified: twiki/branches/TWikiRelease04x00/lib/TWiki/Client.pm =================================================================== --- twiki/branches/TWikiRelease04x00/lib/TWiki/Client.pm 2006-05-30 00:28:59 UTC (rev 10385) +++ twiki/branches/TWikiRelease04x00/lib/TWiki/Client.pm 2006-05-30 03:42:13 UTC (rev 10386) @@ -258,7 +258,7 @@ # is this a logout? if( $query && $query->param( 'logout' ) ) { _trace($this, "User is logging out"); - my $origurl = $query->url().$query->path_info(); + my $origurl = $ENV{HTTP_REFERER} || $query->url().$query->path_info(); $this->redirectCgiQuery( $query, $origurl ); $authUser = undef; } |