diff options
author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-16 06:42:08 +0100 |
---|---|---|
committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-16 06:42:08 +0100 |
commit | 69487389d362285aeeb5106097864ec982c08a59 (patch) | |
tree | f5eede7c0a6a5ade0b097b6646f8de2cb33ba5e5 /mod/item.php | |
parent | fd5d1416d9a65206879588ff195a8e1d3b49c008 (diff) | |
parent | 0cb5f009b483ff570ded4570bb45023573531494 (diff) | |
download | volse-hubzilla-69487389d362285aeeb5106097864ec982c08a59.tar.gz volse-hubzilla-69487389d362285aeeb5106097864ec982c08a59.tar.bz2 volse-hubzilla-69487389d362285aeeb5106097864ec982c08a59.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mod/item.php')
-rw-r--r-- | mod/item.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mod/item.php b/mod/item.php index 5bf59de26..b66d71797 100644 --- a/mod/item.php +++ b/mod/item.php @@ -473,8 +473,8 @@ function item_post(&$a) { require_once('include/text.php'); if($uid && $uid == $profile_uid && feature_enabled($uid,'markdown')) { require_once('include/bb2diaspora.php'); + $body = escape_tags(trim($body)); $body = str_replace("\n",'<br />', $body); - $body = purify_html($body); $body = preg_replace_callback('/\[share(.*?)\]/ism','share_shield',$body); $body = diaspora2bb($body,true); |