diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt index 4c8ad8cbe..e3d9e2297 100644 --- a/docs/changelog/6.x.x.txt +++ b/docs/changelog/6.x.x.txt @@ -1,3 +1,8 @@ +6.7.1 + - Fixed a fatal error with Redirects + - Fixed a fatal error in the date field in the new pluggable forms system. + + 6.7.0 - Upgraded the rich editor to 1.45. - Rich edit now has three new buttons: paste from word, paste as plain text, diff --git a/lib/WebGUI/Asset/Redirect.pm b/lib/WebGUI/Asset/Redirect.pm index b52789ead..25d8c9190 100644 --- a/lib/WebGUI/Asset/Redirect.pm +++ b/lib/WebGUI/Asset/Redirect.pm @@ -120,7 +120,7 @@ sub www_view { if ($session{var}{adminOn}) { return $self->getContainer->www_view; } - WebGUI::HTTP::setRedirect(WebGUI::Macro::process($self->get("redirectUrl"))) unless $self->newByUrl($self->get("redirectUrl"))->getUrl eq $self->getUrl; + WebGUI::HTTP::setRedirect(WebGUI::Macro::process($self->get("redirectUrl"))) unless $self->get("redirectUrl") eq $self->get("url"); return "Redirect is self-referential"; } diff --git a/lib/WebGUI/Form/date.pm b/lib/WebGUI/Form/date.pm index 569ada6bc..cf1c18b3b 100644 --- a/lib/WebGUI/Form/date.pm +++ b/lib/WebGUI/Form/date.pm @@ -123,7 +123,7 @@ Renders a date picker control. sub toHtml { my $self = shift; - my $value = WebGUI::DateTime::epochToSet($self->{value}) unless ($self->{noDate} && $self->{value} eq ''); + my $self->{value} = WebGUI::DateTime::epochToSet($self->{value}) unless ($self->{noDate} && $self->{value} eq ''); my $language = WebGUI::International::getLanguage($session{user}{language},"languageAbbreviation"); unless ($language) { $language = WebGUI::International::getLanguage("English","languageAbbreviation"); @@ -133,14 +133,7 @@ sub toHtml { WebGUI::Style::setScript($session{config}{extrasURL}.'/calendar/calendar-setup.js',{ type=>'text/javascript' }); WebGUI::Style::setLink($session{config}{extrasURL}.'/calendar/calendar-win2k-1.css', { rel=>"stylesheet", type=>"text/css", media=>"all" }); my $mondayFirst = $session{user}{firstDayOfWeek} ? "true" : "false"; - return WebGUI::Form::text->new( - name=>$self->{name}, - value=>$value, - size=>$self->{size}, - extras=>$self->{extras}, - id=>$self->{id}, - maxlength=>$self->{maxlength} - )->toHtml . '