From bfe4e1bf3dfd557e9218d9004dbfe18a4cef0f8f Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Tue, 22 Dec 2009 18:39:40 +0000
Subject: [PATCH] - web: fix motd bug

svn path=/trunk/boinc/; revision=20013
---
 checkin_notes     |  6 ++++++
 html/inc/news.inc | 16 ++++++++++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index efe177b581..2c061e8ec4 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -10574,3 +10574,9 @@ Rom    22 Dec 2009
         
     clientgui/
         DlgEventLog.cpp, .h
+
+David  22 Dec 2009
+    - web: fix motd bug
+
+    html/inc
+        news.inc
diff --git a/html/inc/news.inc b/html/inc/news.inc
index 4552ed70f4..82f603833a 100644
--- a/html/inc/news.inc
+++ b/html/inc/news.inc
@@ -24,11 +24,23 @@ function news_item($date, $title, $post) {
         echo "<span class=news_title>$title</span><br>\n";
     }
     $d = time_str($date);
-    $text = bb2html($post->content);
+    if (is_string($post)) {
+        $forum_link = false;
+        $text = bb2html($post);
+    } else {
+        $forum_link = true;
+        $text = bb2html($post->content);
+    }
     echo "
         <span class=news_content>$text</span>
         <br><span class=news_date>$d
-        &middot; <a href=".URL_BASE."forum_thread.php?id=$post->thread> ".tra("Comment")."</a></span>
+    ";
+    if ($forum_link) {
+        echo "
+            &middot; <a href=".URL_BASE."forum_thread.php?id=$post->thread> ".tra("Comment")."</a>
+        ";
+    }
+    echo "</span>
     ";
 }