--- faq.module.bak      2006-06-05 20:11:21.000000000 +0200
+++ faq.module  2006-06-05 20:10:12.000000000 +0200
@@ -105,7 +105,7 @@
                                                $block['subject'] = t('FAQ Categories');
                                                $block['content'] = '<ul>' . "\n";
                                                foreach($terms as $name => $tid){
-                                                       $block['content'] .= '<li><a href="faq/show/' . $tid . '">' . $name . '</a></li>' . "\n";
+                                                       $block['content'] .= '<li>'. l($name, 'faq/show/' . $tid) . '</li>' . "\n";
                                                }
                                                $block['content'] .= '</ul>' . "\n";
                                        }
@@ -216,7 +216,7 @@
        $found = false;
        $result = db_query('SELECT n.nid, n.title FROM {node} n, {term_node} t, {faq} f WHERE t.nid = n.nid AND f.fid = n.nid AND n.type="faq" AND n.status=1 AND t.tid = %d ORDER BY 
f.weight, n.title', $term->tid);

-       $output = '<h2><a href="faq/show/' . $term->tid . '">' . $term->name . '</a></h2>' . "\n";
+       $output = '<h2>'. l($term->name, 'faq/show/' . $term->tid) . '</h2>' . "\n";
        $output .= '<ul>' . "\n";
        while($node = db_fetch_object($result)){
                $node = node_prepare($node);
@@ -226,7 +226,7 @@
                        $edit = ' (<a href="node/' . $node->nid . '/edit">edit</a>)';
                }

-               $output .= '<li><a href="faq/show/' . $term->tid . '#q_' . $node->nid . '">' . $node->title . '</a>' . $edit . '</li>';
+               $output .= '<li>'. l($node->title, 'faq/show/' . $term->tid . '#q_' . $node->nid) . $edit . '</li>';
                $found = true;
        }
        $output .= '</ul>' . "\n";
@@ -256,7 +256,7 @@
                        $edit = '<a href="node/' . $node->nid . '/edit">edit</a>';
                }

-               $links .= '<li><a href="faq/show/' . $term->tid . '#q_' . $node->nid . '">' . $node->title . '</a>' . ($edit == '' ? '' : ' (' . $edit . ') ') . '</li>';
+               $links .= '<li>'. l($node->title, 'faq/show/' . $term->tid . '#q_' . $node->nid) . ($edit == '' ? '' : ' (' . $edit . ') ') . '</li>';

                //Add the voting form if enabled and applicable. Hacky, I know.
                if($node->voting && function_exists('voting_control_node')){