From 532233a9792c2495ba31d1f0b211d61ddec9ea6e Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Sun, 20 May 2001 19:30:39 +0000
Subject: - Removed includes/timer.inc: it has been integrated in common.inc.

- Fixed a bug in node.php: UnConeD forgot to update 1 node_get_object().

- I changed the look of theme_morelink() a bit: it might not look better,
  but at least the output is "correct".

- Various small improvements.
---
 includes/theme.inc | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'includes/theme.inc')

diff --git a/includes/theme.inc b/includes/theme.inc
index 269a5da2e..dc2108eab 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -98,7 +98,14 @@ function theme_blocks($region, $theme) {
 }
 
 function theme_morelink($theme, $node) {
-  return ($node->body) ? "[ <A HREF=\"node.php?id=$node->nid\"><FONT COLOR=\"$theme->link\">". t("read more") ."</FONT></A> | ". sizeof(explode(" ", $node->body)) ." ". t("words") ." | <A HREF=\"node.php?id=$node->nid\"><FONT COLOR=\"$theme->link\">". format_plural(node_get_comments($node->nid), "comment", "comments") ."</FONT></A> ]" : "[ <A HREF=\"node.php?id=$node->nid\"><FONT COLOR=\"$theme->link\">". format_plural(node_get_comments($node->nid), "comment", "comments") ."</FONT></A> ]";
+  if ($node->body) {
+    $link[] = "<A HREF=\"node.php?id=$node->nid\"><FONT COLOR=\"$theme->link\">". t("read more") ."</FONT></A>";
+  }
+  if ($node->comment) {
+    $link[] = "<A HREF=\"node.php?id=$node->nid\"><FONT COLOR=\"$theme->link\">". format_plural(node_get_comments($node->nid), "comment", "comments") ."</FONT></A>";
+  }
+
+  return ($link ? "[ ". implode(" | ", $link) ." ]" : "");
 }
 
 function theme_moderation_results($theme, $node) {
-- 
cgit v1.2.3