From 118c18569f1cf3f2e0bd25aab532964c9de2e955 Mon Sep 17 00:00:00 2001
From: David Delikat <david-delikat@usa.net>
Date: Sat, 31 Jan 2009 19:12:34 +0000
Subject: [PATCH] caching now takes into account the correct parameter for
 pagination

---
 docs/changelog/7.x.x.txt            | 1 +
 lib/WebGUI/Asset/Wobject/Article.pm | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 87f7314c3..3e75e9c61 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -1,4 +1,5 @@
 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: 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
diff --git a/lib/WebGUI/Asset/Wobject/Article.pm b/lib/WebGUI/Asset/Wobject/Article.pm
index 210e1f2bf..bec5d3331 100644
--- a/lib/WebGUI/Asset/Wobject/Article.pm
+++ b/lib/WebGUI/Asset/Wobject/Article.pm
@@ -280,7 +280,8 @@ returns the output.
 
 sub view {
 	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;
 		return $out if $out;
 	}
@@ -343,7 +344,8 @@ sub view {
 	}
 	$p->appendTemplateVars(\%var);
        	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"));
 	}
        	return $out;