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

caching now takes into account the correct parameter for pagination

Browse source
This commit is contained in:
David Delikat 2009-01-31 19:12:34 +00:00
parent 101e95fd63
commit 118c18569f
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,5 @@
7.6.11 7.6.11
- fixed #9596: caching now takes into account the correct parameter for pagination
- fixed #9596: Articles now use a semi-unique pagination variable based on asset id - fixed #9596: Articles now use a semi-unique pagination variable based on asset id
- fixed: Syndicated Content asset doesn't work with feeds that specify their encodings via HTTP headers - fixed: Syndicated Content asset doesn't work with feeds that specify their encodings via HTTP headers
- fixed #9375: Syndicated Content asset improperly decodes wide XML entities - fixed #9375: Syndicated Content asset improperly decodes wide XML entities

6
lib/WebGUI/Asset/Wobject/Article.pm
View file

@ -280,7 +280,8 @@ returns the output.
sub view { sub view {
my $self = shift; my $self = shift;
if (!$self->session->var->isAdminOn && $self->get("cacheTimeout") > 10 && !$self->session->form->process("overrideTemplateId") && !$self->session->form->process("pn") && !$self->session->form->process("makePrintable")) { if (!$self->session->var->isAdminOn && $self->get("cacheTimeout") > 10 && !$self->session->form->process("overrideTemplateId") &&
!$self->session->form->process($self->paginateVar) && !$self->session->form->process("makePrintable")) {
my $out = WebGUI::Cache->new($self->session,"view_".$self->getId)->get; my $out = WebGUI::Cache->new($self->session,"view_".$self->getId)->get;
return $out if $out; return $out if $out;
} }
@ -343,7 +344,8 @@ sub view {
} }
$p->appendTemplateVars(\%var); $p->appendTemplateVars(\%var);
my $out = $self->processTemplate(\%var,undef,$self->{_viewTemplate}); my $out = $self->processTemplate(\%var,undef,$self->{_viewTemplate});
if (!$self->session->var->isAdminOn && $self->get("cacheTimeout") > 10 && !$self->session->form->process("overrideTemplateId") && !$self->session->form->process("pn") && !$self->session->form->process("makePrintable")) { if (!$self->session->var->isAdminOn && $self->get("cacheTimeout") > 10 && !$self->session->form->process("overrideTemplateId") &&
!$self->session->form->process($self->paginateVar) && !$self->session->form->process("makePrintable")) {
WebGUI::Cache->new($self->session,"view_".$self->getId)->set($out,$self->get("cacheTimeout")); WebGUI::Cache->new($self->session,"view_".$self->getId)->set($out,$self->get("cacheTimeout"));
} }
return $out; return $out;