diff options
author | zotlabs <mike@macgirvin.com> | 2018-01-14 18:22:58 -0800 |
---|---|---|
committer | zotlabs <mike@macgirvin.com> | 2018-01-14 18:22:58 -0800 |
commit | 91db66b32d2c469a6d0292712666614b48b4c62e (patch) | |
tree | d2f883403453671679ae05f779178f46eae51b0d | |
parent | f0faa7f9b06481200c21459f9c53db457b7941b3 (diff) | |
download | volse-hubzilla-91db66b32d2c469a6d0292712666614b48b4c62e.tar.gz volse-hubzilla-91db66b32d2c469a6d0292712666614b48b4c62e.tar.bz2 volse-hubzilla-91db66b32d2c469a6d0292712666614b48b4c62e.zip |
move markdown-in-posts/comments feature to plugin
-rw-r--r-- | Zotlabs/Module/Item.php | 14 | ||||
-rw-r--r-- | include/features.php | 15 |
2 files changed, 10 insertions, 19 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.) diff --git a/include/features.php b/include/features.php index 8601ff79e..69eeed3e8 100644 --- a/include/features.php +++ b/include/features.php @@ -374,15 +374,6 @@ function get_features($filtered = true) { t('Post/Comment Tools'), [ - 'markdown', - t('Markdown'), - t('Use markdown for editing posts'), - false, - get_config('feature_lock','markdown'), - feature_level('markdown',2), - ], - - [ 'commtag', t('Community Tagging'), t('Ability to tag existing posts'), @@ -490,6 +481,8 @@ function get_features($filtered = true) { else { $narr = $arr; } - call_hooks('get_features',$narr); - return $narr; + + $x = [ 'features' => $narr, 'filtered' => $filtered, 'techlevel' => $techlevel ]; + call_hooks('get_features',$x); + return $x['features']; } |