diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 94d71e40f..bb89fbf8f 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -1,3 +1,13 @@ +7.10.24 + - fixed #12256: Calendar Search doesn't show admin controls + - fixed #12268: Point of sale form missing from cart screen. + - fixed #12201: AssetReport - no selects. + - fixed #12269: Login / Loginbox with encryptlogin + - fixed #12271: Calendar List View does not always show labels + - fixed Passive Analytics, UI, Progress Bar, server load. + - fixed #12303: Survey custom multiple choice question types + - fixed #12304: Surven packages do not include custom question types + 7.10.23 - fixed #12225: Stock asset, multiple instances on a page - fixed #12229: Indexed thingy data has gateway url prepended to it diff --git a/lib/WebGUI/Asset/Event.pm b/lib/WebGUI/Asset/Event.pm index 0d6af74a6..ce5e01467 100644 --- a/lib/WebGUI/Asset/Event.pm +++ b/lib/WebGUI/Asset/Event.pm @@ -2454,10 +2454,11 @@ sub www_view { return $self->session->privilege->noAccess() unless $self->canView; my $check = $self->checkView; return $check if (defined $check); - $self->session->response->setCacheControl($self->getParent->visitorCacheTimeout) if ($self->session->user->isVisitor); + my $calendar = $self->getParent; + $self->session->response->setCacheControl($calendar->visitorCacheTimeout) if ($self->session->user->isVisitor); $self->session->response->sendHeader; $self->prepareView; - my $style = $self->getParent->processStyle($self->getSeparator); + my $style = $calendar->processStyle($self->getSeparator); my ($head, $foot) = split($self->getSeparator,$style); $self->session->output->print($head,1); $self->session->output->print($self->view); diff --git a/lib/WebGUI/Asset/Post/Thread.pm b/lib/WebGUI/Asset/Post/Thread.pm index 0e1cdfe6b..f6e7e3cb1 100644 --- a/lib/WebGUI/Asset/Post/Thread.pm +++ b/lib/WebGUI/Asset/Post/Thread.pm @@ -1456,10 +1456,11 @@ sub www_view { return $self->session->privilege->noAccess() unless $self->canView; my $check = $self->checkView; return $check if (defined $check); - $self->session->response->setCacheControl($self->visitorCacheTimeout) if ($self->session->user->isVisitor); + my $cs = $self->getParent; + $self->session->response->setCacheControl($cs->visitorCacheTimeout) if ($self->session->user->isVisitor); $self->session->response->sendHeader; $self->prepareView; - my $style = $self->getParent->processStyle($self->getSeparator); + my $style = $cs->processStyle($self->getSeparator); my ($head, $foot) = split($self->getSeparator,$style); $self->session->output->print($head,1); $self->session->output->print($self->view($currentPost));