### Eclipse Workspace Patch 1.0
#P drupal-6-testing
Index: modules/forum/forum.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/forum/forum.module,v
retrieving revision 1.422
diff -u -r1.422 forum.module
--- modules/forum/forum.module	11 Oct 2007 16:37:43 -0000	1.422
+++ modules/forum/forum.module	15 Oct 2007 07:58:10 -0000
@@ -57,6 +57,10 @@
       'template' => 'forum-submitted',
       'arguments' => array('topic' => NULL),
     ),
+    'forum_empty_block' => array(
+      'template' => 'forum-block',
+      'arguments' => array('content' => NULL),
+    ),
   );
 }
 
@@ -413,9 +417,8 @@
         }
 
         if (!empty($content)) {
-          $content .= '<div class="more-link">'. l(t('more'), 'forum', array('title' => t('Read the latest forum topics.'))) .'</div>';
           $block['subject'] = $title;
-          $block['content'] = $content;
+          $block['content'] = theme('forum-block-link', $content);
           return $block;
         }
       }
Index: modules/forum/forum-block.tpl.php
===================================================================
RCS file: modules/forum/forum-block.tpl.php
diff -N modules/forum/forum-block.tpl.php
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ modules/forum/forum-block.tpl.php	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,16 @@
+<?php 
+// $Id
+
+/**
+ * @file forum-empty-block.tpl.php
+ * Display the 'Active forum topics' and 'New forum topics' blocks with a link to the forum.
+ */
+?>
+<?php
+  print $content;
+?>
+<div class="more-link">
+<?php
+  print l(t('more'), 'forum', array('title' => t('Read the latest forum topics.')));
+?>
+</div>