From 80be9a9c5b1c4fe5acf4dd20884b92dfb1c4491d Mon Sep 17 00:00:00 2001
From: "Leigh B. Stoller" <stoller@flux.utah.edu>
Date: Mon, 12 Feb 2007 23:46:38 +0000
Subject: [PATCH] Fix a couple more merge errors.

---
 www/menu.php3 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/menu.php3 b/www/menu.php3
index 770a2cd27..bc2be29cd 100644
--- a/www/menu.php3
+++ b/www/menu.php3
@@ -235,8 +235,8 @@ function WRITESIDEBAR() {
     }
 
     if ($row = mysql_fetch_array($query_result)) {
-	$newsDate = "(".$row[prettydate].")";
-	if ($row[age] < 7) {
+	$newsDate = "(".$row["prettydate"].")";
+	if ($row["age"] < 7) {
 	    $newNews = 1;
 	}
     }
-- 
GitLab