diff options
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/comment.inc | 10 | ||||
| -rw-r--r-- | includes/node.inc | 2 | ||||
| -rw-r--r-- | includes/theme.inc | 14 |
3 files changed, 8 insertions, 18 deletions
diff --git a/includes/comment.inc b/includes/comment.inc index 580dcdc98..51aad93f1 100644 --- a/includes/comment.inc +++ b/includes/comment.inc @@ -155,16 +155,6 @@ function comment_num_replies($id, $count = 0) { return ($result) ? db_result($result, 0) : 0; } -function comment_num_filtered($lid, $pid) { - global $user; - - $threshold = ($user->id) ? $user->threshold : "0"; - $pid = ($pid) ? $pid : 0; - - $result = db_query("SELECT COUNT(cid) FROM comments WHERE lid = '$lid' AND pid = '$pid' AND ((votes = 0 AND score < $threshold) OR (score / votes < $threshold))"); - return ($result) ? db_result($result, 0) : 0; -} - function comment_moderation($comment) { global $comment_votes, $op, $user; diff --git a/includes/node.inc b/includes/node.inc index 374732ae6..8f43f411d 100644 --- a/includes/node.inc +++ b/includes/node.inc @@ -177,7 +177,7 @@ function node_control($node) { </SCRIPT> <?php - if ($user->id) + if ($user->id) $choices = array("node.php?id=$node->nid" => t("view node"), "submit.php?mod=$node->type" => t("add node"), "submit.php?mod=$node->type&op=update&id=$node->nid" => t("update node"), "node.php?op=history&id=$node->nid" => t("view history")); else $choices = array("node.php?id=$node->nid" => t("view node"), "node.php?op=history&id=$node->nid" => t("view history")); diff --git a/includes/theme.inc b/includes/theme.inc index dbeb5fab8..793824d06 100644 --- a/includes/theme.inc +++ b/includes/theme.inc @@ -14,14 +14,14 @@ function theme_init() { function theme_link($separator = " | ") { global $repository; - $links = array("<A HREF=\"index.php\">". t("home") ."</A>", - "<A HREF=\"search.php\">". t("search") ."</A>", - "<A HREF=\"submit.php\">". t("submit") ."</A>"); - if (is_array($repository[diary])) - $links[] = "<A HREF=\"module.php?mod=diary\">". t("diary") ."</A>"; + $links[] = "<A HREF=\"index.php\">". t("home") ."</A>"; + $links[] = "<A HREF=\"search.php\">". t("search") ."</A>"; + $links[] = "<A HREF=\"submit.php\">". t("submit") ."</A>"; + if ($repository[forum]) $links[] = "<A HREF=\"module.php?mod=forum\">".t("forum") ."</A>"; + if ($repository[diary]) $links[] = "<A HREF=\"module.php?mod=diary\">". t("diary") ."</A>"; $links[] = "<A HREF=\"account.php\">". t("account") ."</A>"; - if (is_array($repository[diary])) - $links[] = "<A HREF=\"module.php?mod=book\">". t("handbook") ."</A>"; + if ($repository[book]) $links[] = "<A HREF=\"module.php?mod=book\">". t("handbook") ."</A>"; + return implode($separator, $links); } |