don't check for notice in rendering content; just render it!

darcs-hash:20080529172549-84dde-12c79e34baa6a19938350447f5939fb25febea21.gz

diff --git a/lib/util.php b/lib/util.php
index 7a0d5d11f11d3eb8e7ea208eb95e8a673f347b9e..54a30a914df840bbca9f4f6002ef5d606352ce71 100644 (file)
--- a/lib/util.php
+++ b/lib/util.php
@@ -349,12 +349,10 @@ function common_canonical_email($email) {
        return $email;
 }
 
-function common_render_content($text, $notice=NULL) {
+function common_render_content($text, $notice) {
        $r = htmlspecialchars($text);
-       if ($notice) {
-               $id = $notice->profile_id;
-               $r = preg_replace('/\b@([\w-]+)\b/e', "ATLINK*** \\1 ***", $r);
-       }
+       $id = $notice->profile_id;
+       $r = preg_replace('/\b@([\w-]+)\b/e', "@common_at_link($id,'\\1')", $r);
        # XXX: # tags
        # XXX: machine tags
        return $r;