From 8043cb998f3325731bfab8d82251fa49639aec1d Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Sat, 20 Apr 2002 11:52:50 +0000
Subject: - Applied Marco's big patch, including contributions from Moshe:

    + Changed the db_query() API.

    + Wrapped all links in l(), lm(), la(), ..., drupal_url() functions.

    + XHTML-ified some HTML.

    + Wrapped a lot of text in the administrative pages in a t()
      function.

    + Replaced all $REQUEST_URI/$PATH_INFOs by request_uri().

    + Small bugfixes (eg. bug in book_export_html() and clean-ups (eg.
      RSS code).

    + Fixed some bugs in the taxonomy module (eg. tree making bug), added
      new functionality (eg. new APIs for use by other modules), included
      Moshe's taxonomy extensions, and some documentation udpates.

    + ...
---
 modules/forum.module | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'modules/forum.module')

diff --git a/modules/forum.module b/modules/forum.module
index 658f45f78..3c2d5c5c7 100644
--- a/modules/forum.module
+++ b/modules/forum.module
@@ -35,11 +35,11 @@ function forum_save($op, $node) {
 
 function forum_link($type) {
   if ($type == "page" && user_access("access content")) {
-    $links[] = "<a href=\"module.php?mod=forum\" title=\"". t("Read and participate in the discussion forums.") ."\">". t("forum") ."</a>";
+    $links[] = lm(t("forum"), array("mod" => "forum"), t("Read and participate in the discussion forums."));
   }
 
   if ($type == "menu.create" && user_access("administer nodes")) {
-    $links[] = "<a href=\"module.php?mod=node&op=add&type=forum\" title=\"". t("Add a new discussion forum.") ."\">". t("create forum") ."</a>";
+    $links[] = lm(t("create forum"), array("mod" => "node", "op" => "add", "type" => "forum"), t("Add a new discussion forum."));
   }
 
   return $links ? $links : array();
@@ -47,7 +47,7 @@ function forum_link($type) {
 
 function forum_view($node) {
   global $theme;
-  $output .= "<p><a href=\"module.php?mod=forum\">". t("Forum") ."</a> / <b><a href=\"node.php?id=$node->nid\">". check_output($node->title) ."</a></b>:</p><p>". check_output($node->body) ."</p>";
+  $output .= "<p>".lm(t("Forum"), array("mod" => "forum"))." / <b>".l(check_output($node->title), array("id" => $node->nid))."</b>:</p><p>". check_output($node->body) ."</p>";
   $output .= "<p>". $theme->links(link_node($node, $main)) ."</p>";
 
   $theme->box(t("Discussion forum"), $output);
@@ -81,7 +81,7 @@ function forum_page() {
     $output .= " <tr><th>". t("Forum") ."</th><th>". t("Comments") ."</th><th>". t("Last comment") ."</th></tr>";
     while ($node = db_fetch_object($result)) {
       $node = node_load(array("nid" => $node->nid));
-      $output .= " <tr><td><a href=\"node.php?id=$node->nid\">". check_output($node->title) ."</a><br /><small>". check_output($node->body, 1) ."</small></td><td align=\"center\">". forum_num_comments($node->nid) ."</td><td align=\"center\">". forum_last_comment($node->nid) ."</td></tr>";
+      $output .= " <tr><td>".l(check_output($node->title), array("id" => $node->nid))."<br /><small>". check_output($node->body, 1) ."</small></td><td align=\"center\">". forum_num_comments($node->nid) ."</td><td align=\"center\">". forum_last_comment($node->nid) ."</td></tr>";
     }
     $output .= "</table>";
 
-- 
cgit v1.2.3