From 93ef776635f19c0c817c5e5b9b1f8e68fa168593 Mon Sep 17 00:00:00 2001
From: Graham Knop <graham@plainblack.com>
Date: Wed, 19 Mar 2008 22:37:10 +0000
Subject: [PATCH] fixed: Matrix caches pages, and may not update for new
 listings

---
 docs/changelog/7.x.x.txt           | 1 +
 lib/WebGUI/Asset/Wobject/Matrix.pm | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index bd708492a..7fc623b94 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -5,6 +5,7 @@
  - fixed: Wiki page history shows username instead of alias
  - added: Uploads locations and files are set to the same uid/gid that owns the uploads root
  - fixed: SQL Form fields with a regex are required even if not set to required
+ - fixed: Matrix caches pages, and may not update for new listings
 
 7.5.6
  - fixed: events get start/end time even when none specified (also can offset start/end day)
diff --git a/lib/WebGUI/Asset/Wobject/Matrix.pm b/lib/WebGUI/Asset/Wobject/Matrix.pm
index 0ab34a047..50bb22be8 100644
--- a/lib/WebGUI/Asset/Wobject/Matrix.pm
+++ b/lib/WebGUI/Asset/Wobject/Matrix.pm
@@ -100,6 +100,11 @@ sub duplicate {
 	return undef;
 }
 
+#-------------------------------------------------------------------
+# Too much data to keep track of modification dates, always assume new data
+sub getContentLastModified {
+    return time();
+}
 
 #-------------------------------------------------------------------
 sub formatURL {
@@ -1140,7 +1145,7 @@ sub www_viewDetail {
 		$var{screenshot} = $storage->getUrl($listing->{filename});
 		$var{thumbnail} = $storage->getThumbnailUrl($listing->{filename});
 	}
-	$var{"discussion"} = $forum->view;
+	$var{"discussion"} = $forum && $forum->view;
 	$var{'isLoggedIn'} = ($self->session->user->userId ne "1");
 	if ($self->session->form->process("do") eq "sendEmail" && $self->session->form->process("verify","captcha")) {
 		if ($self->session->form->process("body") ne "") {