don't check for notice in rendering content; just render it!
darcs-hash:20080529172549-84dde-12c79e34baa6a19938350447f5939fb25febea21.gz
This commit is contained in:
parent
a8fa9eb1bd
commit
fb437aabca
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user