diff --git a/lib/WebGUI/AdminConsole.pm b/lib/WebGUI/AdminConsole.pm index 71cf657e3..e0bf14229 100644 --- a/lib/WebGUI/AdminConsole.pm +++ b/lib/WebGUI/AdminConsole.pm @@ -416,7 +416,7 @@ sub render { my $importNodeLineage = $importNode->get("lineage"); my $assetLineage = $self->session->asset->get("lineage"); if ($assetLineage =~ /^$importNodeLineage/ || $assetLineage eq "000001") { - $var{"backtosite.url"} = $self->session->asset->getDefault->getUrl; + $var{"backtosite.url"} = $self->getDefault($self->session)->getUrl; } else { $var{"backtosite.url"} = $self->session->asset->getContainer->getUrl; } diff --git a/lib/WebGUI/Asset/Wobject.pm b/lib/WebGUI/Asset/Wobject.pm index 221ef6f06..85748b90d 100644 --- a/lib/WebGUI/Asset/Wobject.pm +++ b/lib/WebGUI/Asset/Wobject.pm @@ -584,7 +584,7 @@ sub www_view { return ""; } else { # tell em it doesn't exist anymore $self->session->http->setStatus("410"); - return WebGUI::Asset->getNotFound->www_view; + return WebGUI::Asset->getNotFound($self->session)->www_view; } } if ($self->get("encryptPage") && $self->session->env->get("HTTPS") ne "on") { diff --git a/lib/WebGUI/Asset/Wobject/EventsCalendar.pm b/lib/WebGUI/Asset/Wobject/EventsCalendar.pm index 22ca16910..df03f5a07 100644 --- a/lib/WebGUI/Asset/Wobject/EventsCalendar.pm +++ b/lib/WebGUI/Asset/Wobject/EventsCalendar.pm @@ -213,7 +213,7 @@ sub view { $children = $self->getLineage(["descendants"],{returnObjects=>1, includeOnlyClasses=>["WebGUI::Asset::Event"]}); } elsif ($scope == 1) { #calendar is global - $children = WebGUI::Asset::getRoot()->getLineage(["descendants"],{returnObjects=>1, + $children = WebGUI::Asset::getRoot($self->session)->getLineage(["descendants"],{returnObjects=>1, includeOnlyClasses=>["WebGUI::Asset::Event"]}); } diff --git a/lib/WebGUI/Form/Asset.pm b/lib/WebGUI/Form/Asset.pm index 0f42c6bed..6fb8714e3 100644 --- a/lib/WebGUI/Form/Asset.pm +++ b/lib/WebGUI/Form/Asset.pm @@ -95,7 +95,7 @@ Renders an asset selector. sub toHtml { my $self = shift; - my $asset = WebGUI::Asset->newByDynamicClass($self->get("value")) || WebGUI::Asset->getRoot; + my $asset = WebGUI::Asset->newByDynamicClass($self->get("value")) || WebGUI::Asset->getRoot($self->session); return WebGUI::Form::Hidden->new( name=>$self->get("name"), extras=>$self->get("extras"),