diff options
| author | friendica <info@friendica.com> | 2015-01-01 22:33:28 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-01-01 22:33:28 -0800 |
| commit | 82d0a4af452015e870bdcea56f1008ea22d066b3 (patch) | |
| tree | 3ad1db1aeb0dfdeb10a70b99da353fe3094f1d69 /mod/item.php | |
| parent | 9a34e18319301e0a952f674899aeb58b424637a4 (diff) | |
| parent | 68c612c597471404201099ecbc8b4082d152e18a (diff) | |
| download | volse-hubzilla-82d0a4af452015e870bdcea56f1008ea22d066b3.tar.gz volse-hubzilla-82d0a4af452015e870bdcea56f1008ea22d066b3.tar.bz2 volse-hubzilla-82d0a4af452015e870bdcea56f1008ea22d066b3.zip | |
Merge branch 'master' into trinidad
Diffstat (limited to 'mod/item.php')
| -rw-r--r-- | mod/item.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mod/item.php b/mod/item.php index f5a9a4b22..894e23a0f 100644 --- a/mod/item.php +++ b/mod/item.php @@ -470,11 +470,13 @@ function item_post(&$a) { require_once('include/text.php'); if($uid && $uid == $profile_uid && feature_enabled($uid,'markdown')) { - require_once('include/bb2diaspora.php'); - $body = diaspora2bb(escape_tags($body),true); + require_once('include/bb2diaspora.php'); + $body = escape_tags($body); + $body = preg_replace_callback('/\[share(.*?)\]/ism','share_shield',$body); + $body = diaspora2bb($body,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.) // we may need virtual or template classes to implement the possible alternatives |