oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix visitorCacheTimeout usage in the Thread and Event assets. Fixes bug #12309.

Browse source
This commit is contained in:
Colin Kuskie 2011-12-09 10:59:26 -08:00
parent 5f9f1e6dec
commit 69dc8f576e
3 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
docs/changelog/7.x.x.txt
View file

@ -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 7.10.23
- fixed #12225: Stock asset, multiple instances on a page - fixed #12225: Stock asset, multiple instances on a page
- fixed #12229: Indexed thingy data has gateway url prepended to it - fixed #12229: Indexed thingy data has gateway url prepended to it

5
lib/WebGUI/Asset/Event.pm
View file

@ -2454,10 +2454,11 @@ sub www_view {
return $self->session->privilege->noAccess() unless $self->canView; return $self->session->privilege->noAccess() unless $self->canView;
my $check = $self->checkView; my $check = $self->checkView;
return $check if (defined $check); 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->session->response->sendHeader;
$self->prepareView; $self->prepareView;
my $style = $self->getParent->processStyle($self->getSeparator); my $style = $calendar->processStyle($self->getSeparator);
my ($head, $foot) = split($self->getSeparator,$style); my ($head, $foot) = split($self->getSeparator,$style);
$self->session->output->print($head,1); $self->session->output->print($head,1);
$self->session->output->print($self->view); $self->session->output->print($self->view);

5
lib/WebGUI/Asset/Post/Thread.pm
View file

@ -1456,10 +1456,11 @@ sub www_view {
return $self->session->privilege->noAccess() unless $self->canView; return $self->session->privilege->noAccess() unless $self->canView;
my $check = $self->checkView; my $check = $self->checkView;
return $check if (defined $check); 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->session->response->sendHeader;
$self->prepareView; $self->prepareView;
my $style = $self->getParent->processStyle($self->getSeparator); my $style = $cs->processStyle($self->getSeparator);
my ($head, $foot) = split($self->getSeparator,$style); my ($head, $foot) = split($self->getSeparator,$style);
$self->session->output->print($head,1); $self->session->output->print($head,1);
$self->session->output->print($self->view($currentPost)); $self->session->output->print($self->view($currentPost));