Remove use of gateway config option from getRequestedUrl.

This commit is contained in:
Colin Kuskie 2011-01-04 21:13:12 -08:00
parent 8ba07e0454
commit b0af5d2cd3

View file

@ -323,10 +323,10 @@ Returns the URL of the page requested (no gateway, no query params, just the pag
sub getRequestedUrl { sub getRequestedUrl {
my $self = shift; my $self = shift;
return undef unless ($self->session->request); return undef unless (my $request = $self->session->request);
unless ($self->{_requestedUrl}) { unless ($self->{_requestedUrl}) {
$self->{_requestedUrl} = decode_utf8($self->session->request->path_info); # TODO - is path_info right? $self->{_requestedUrl} = decode_utf8($request->path_info); # TODO - is path_info right?
my $gateway = $self->session->config->get("gateway"); my $gateway = $request->base->path;
$self->{_requestedUrl} =~ s/^$gateway([^?]*)\??.*$/$1/; $self->{_requestedUrl} =~ s/^$gateway([^?]*)\??.*$/$1/;
} }
return $self->{_requestedUrl}; return $self->{_requestedUrl};