diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt index 6df86e76e..8821613b2 100644 --- a/docs/changelog/6.x.x.txt +++ b/docs/changelog/6.x.x.txt @@ -38,6 +38,9 @@ - fix: Can not make Shortcut for CollaborationSystem - fix: EMS Transactions Dropping Free Events - fix: EMS Prerequisite Cache Stale + - Fixed a macro processing problem on the Redirect asset. + - Added a log info entry when a redirect occurs. + 6.99.3 - Someone removed the status from the submission templates. That has been diff --git a/lib/WebGUI/Asset/Redirect.pm b/lib/WebGUI/Asset/Redirect.pm index 479600c5a..5e92bb429 100644 --- a/lib/WebGUI/Asset/Redirect.pm +++ b/lib/WebGUI/Asset/Redirect.pm @@ -101,17 +101,17 @@ sub www_view { my $self = shift; return $self->session->privilege->noAccess() unless $self->canView; my $i18n = WebGUI::International->new($self->session, "Asset_Redirect"); + my $url = $self->get("redirectUrl"); + WebGUI::Macro::process($self->session, \$url); if ($self->session->var->isAdminOn() && $self->canEdit) { return $self->getAdminConsole->render($i18n->get("what do you want to do with this redirect").' ',$i18n->get("assetName")); } - my $url = $self->get("redirectUrl"); - WebGUI::Macro::process(\$url); - $self->session->http->setRedirect($url) unless $self->get("redirectUrl") eq $self->get("url"); + $self->session->http->setRedirect($url) unless $url eq $self->get("url"); return $i18n->get('self_referential'); } diff --git a/lib/WebGUI/Session/Http.pm b/lib/WebGUI/Session/Http.pm index 02539b431..21ee34e01 100644 --- a/lib/WebGUI/Session/Http.pm +++ b/lib/WebGUI/Session/Http.pm @@ -367,6 +367,7 @@ sub setRedirect { my $url = shift; my @params = $self->session->form->param; return undef if ($url eq $self->session->url->page() && scalar(@params) < 1); # prevent redirecting to self + $self->session->errorHandler->info("Redirecting to $url"); $self->{_http}{location} = $url; $self->setStatus("302", "Redirect"); $self->session->style->setMeta({"http-equiv"=>"refresh",content=>"0; URL=".$url});