diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt index 19689d828..e0a50aeba 100644 --- a/docs/changelog/6.x.x.txt +++ b/docs/changelog/6.x.x.txt @@ -62,6 +62,7 @@ - fix [ 1443378 ] 6.99 Commerce system needs to be sessionized - fix [ 1442942 ] 6.99: listLDAPLinks broken - fix [ 1430276 ] 6.9: Can't kill active sessions + - fix [ 1429389 ] 6.9: "1" appended to HTML 6.8.8 - fix [ 1437186 ] 6.8.7 deploy DataForm package does not copy fields diff --git a/lib/WebGUI.pm b/lib/WebGUI.pm index bf5b718da..96221bef5 100644 --- a/lib/WebGUI.pm +++ b/lib/WebGUI.pm @@ -168,7 +168,7 @@ sub page { $output = tryAssetMethod($session,$asset,"view") unless ($output || ($method eq "view")); } } - if ($output eq "") { + if (defined($output) and $output eq "") { $session->http->setStatus("404","Page Not Found"); my $notFound = WebGUI::Asset->getNotFound($session); if (defined $notFound) { diff --git a/lib/WebGUI/Asset/File.pm b/lib/WebGUI/Asset/File.pm index 75682958e..f9a769873 100644 --- a/lib/WebGUI/Asset/File.pm +++ b/lib/WebGUI/Asset/File.pm @@ -330,7 +330,7 @@ sub www_view { return $self->getContainer->www_view; } $self->session->http->setRedirect($self->getFileUrl); - return ""; + return undef; } diff --git a/lib/WebGUI/Asset/Wobject.pm b/lib/WebGUI/Asset/Wobject.pm index a79ed0870..a4dcbe41d 100644 --- a/lib/WebGUI/Asset/Wobject.pm +++ b/lib/WebGUI/Asset/Wobject.pm @@ -602,6 +602,7 @@ sub www_view { $self->session->output->print($head); $self->session->output->print($self->view); $self->session->output->print($foot); + return undef; } #-------------------------------------------------------------------