diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-11-11 15:09:22 -0800 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-11-11 15:09:22 -0800 |
| commit | bd3d32384956f8c5c7ca2624c96f47bb66d8958c (patch) | |
| tree | c6da0221b5dcdcee1dcec42380e87ab40e245734 | |
| parent | 75c10eaff56370920ae0fc771f3a90c4d4ca28d1 (diff) | |
| download | volse-hubzilla-bd3d32384956f8c5c7ca2624c96f47bb66d8958c.tar.gz volse-hubzilla-bd3d32384956f8c5c7ca2624c96f47bb66d8958c.tar.bz2 volse-hubzilla-bd3d32384956f8c5c7ca2624c96f47bb66d8958c.zip | |
run markdown through html purifier for those who insist on mixing html with markdown.
| -rw-r--r-- | mod/item.php | 3 | ||||
| -rw-r--r-- | version.inc | 2 |
2 files changed, 3 insertions, 2 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); diff --git a/version.inc b/version.inc index c4168039b..3b6ad6e9a 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-11-10.1212 +2015-11-11.1213 |