diff options
| author | zotlabs <mike@macgirvin.com> | 2018-01-15 21:49:28 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-01-15 21:49:28 -0800 |
| commit | 05f9f0a393d7e414481f3e33e651d33f341e59b0 (patch) | |
| tree | 093113813f751891d6f1686e9351727b449c102b /Zotlabs/Module/Item.php | |
| parent | 76c8bbf7b83d6cdbd0b16ebbdaa4cab48662221f (diff) | |
| parent | 746ea5a3691a67ceb176352e8b6fcfe0f2dc99d6 (diff) | |
| download | volse-hubzilla-05f9f0a393d7e414481f3e33e651d33f341e59b0.tar.gz volse-hubzilla-05f9f0a393d7e414481f3e33e651d33f341e59b0.tar.bz2 volse-hubzilla-05f9f0a393d7e414481f3e33e651d33f341e59b0.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'Zotlabs/Module/Item.php')
| -rw-r--r-- | Zotlabs/Module/Item.php | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php index 6365230f8..ad829137a 100644 --- a/Zotlabs/Module/Item.php +++ b/Zotlabs/Module/Item.php @@ -504,7 +504,12 @@ class Item extends \Zotlabs\Web\Controller { $body = z_input_filter($body,$mimetype,$execflag); } - // Verify ability to use html or php!!! + + $arr = [ 'profile_uid' => $profile_uid, 'content' => $body, 'mimetype' => $mimetype ]; + call_hooks('post_content',$arr); + $body = $arr['content']; + $mimetype = $arr['mimetype']; + $gacl = $acl->get(); $str_contact_allow = $gacl['allow_cid']; @@ -516,13 +521,6 @@ class Item extends \Zotlabs\Web\Controller { require_once('include/text.php'); - if($uid && $uid == $profile_uid && feature_enabled($uid,'markdown')) { - require_once('include/markdown.php'); - $body = preg_replace_callback('/\[share(.*?)\]/ism','\share_shield',$body); - $body = markdown_to_bb($body,true,['preserve_lf' => true]); - $body = preg_replace_callback('/\[share(.*?)\]/ism','\share_unshield',$body); - - } // BBCODE alert: the following functions assume bbcode input // and will require alternatives for alternative content-types (text/html, text/markdown, text/plain, etc.) |