GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

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

Browse Source 
darcs-hash:20080529172549-84dde-12c79e34baa6a19938350447f5939fb25febea21.gz
This commit is contained in:
Evan Prodromou 2008-05-29 13:25:49 -04:00
parent a8fa9eb1bd
commit fb437aabca
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/util.php
View File

@ -349,12 +349,10 @@ function common_canonical_email($email) {
return $email; return $email;
} }
function common_render_content($text, $notice=NULL) { function common_render_content($text, $notice) {
$r = htmlspecialchars($text); $r = htmlspecialchars($text);
if ($notice) {
$id = $notice->profile_id; $id = $notice->profile_id;
$r = preg_replace('/\b@([\w-]+)\b/e', "ATLINK*** \\1 ***", $r); $r = preg_replace('/\b@([\w-]+)\b/e', "@common_at_link($id,'\\1')", $r);
}
# XXX: # tags # XXX: # tags
# XXX: machine tags # XXX: machine tags
return $r; return $r;