aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2018-01-15 08:56:15 +0100
committerMario Vavti <mario@mariovavti.com>2018-01-15 08:56:15 +0100
commitb49e09939a5b4222f3edf2b39430c13a4d14baeb (patch)
treed2f883403453671679ae05f779178f46eae51b0d /Zotlabs
parent8970d30c936ac4ae600a6fd18c95b2cdffd1e20d (diff)
parent91db66b32d2c469a6d0292712666614b48b4c62e (diff)
downloadvolse-hubzilla-b49e09939a5b4222f3edf2b39430c13a4d14baeb.tar.gz
volse-hubzilla-b49e09939a5b4222f3edf2b39430c13a4d14baeb.tar.bz2
volse-hubzilla-b49e09939a5b4222f3edf2b39430c13a4d14baeb.zip
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Module/Item.php14
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.)