diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-12 07:46:29 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-12 07:46:29 +0100 |
| commit | 63063450b3da34bf4843fb8d3ffdafc5b32514bc (patch) | |
| tree | 54c5b384f5077dbd7bc7c5a76c5a6d4c84108ca3 /mod/item.php | |
| parent | 90463ee67de2937dddfd6a28cc0514feab47c27c (diff) | |
| parent | 6e04dd96a1ff001f67db59e796b36cba30e4fdb4 (diff) | |
| download | volse-hubzilla-63063450b3da34bf4843fb8d3ffdafc5b32514bc.tar.gz volse-hubzilla-63063450b3da34bf4843fb8d3ffdafc5b32514bc.tar.bz2 volse-hubzilla-63063450b3da34bf4843fb8d3ffdafc5b32514bc.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mod/item.php')
| -rw-r--r-- | mod/item.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mod/item.php b/mod/item.php index 5f45a248b..5bf59de26 100644 --- a/mod/item.php +++ b/mod/item.php @@ -473,8 +473,9 @@ 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($body); $body = str_replace("\n",'<br />', $body); + $body = purify_html($body); + $body = preg_replace_callback('/\[share(.*?)\]/ism','share_shield',$body); $body = diaspora2bb($body,true); $body = preg_replace_callback('/\[share(.*?)\]/ism','share_unshield',$body); |