diff options
| author | jeroenpraat <jeroenpraat@xs4all.nl> | 2014-07-02 13:20:08 +0000 |
|---|---|---|
| committer | jeroenpraat <jeroenpraat@xs4all.nl> | 2014-07-02 13:20:08 +0000 |
| commit | 06935e96eb48a63d37bc127255390fbe8b0d9a23 (patch) | |
| tree | c0ea4cae9e77ed3f3565950422e2f03f0898f6b9 /mod/item.php | |
| parent | 42c9a67deeb1f80feee079096802e8524ee28d89 (diff) | |
| parent | 409c767ba12cc268538dd0f09afc7cf77e80ada9 (diff) | |
| download | volse-hubzilla-06935e96eb48a63d37bc127255390fbe8b0d9a23.tar.gz volse-hubzilla-06935e96eb48a63d37bc127255390fbe8b0d9a23.tar.bz2 volse-hubzilla-06935e96eb48a63d37bc127255390fbe8b0d9a23.zip | |
Merge branch 'master' of https://github.com/friendica/red
Diffstat (limited to 'mod/item.php')
| -rw-r--r-- | mod/item.php | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/mod/item.php b/mod/item.php index c9ec56eeb..c346389e7 100644 --- a/mod/item.php +++ b/mod/item.php @@ -375,7 +375,7 @@ function item_post(&$a) { killme(); } } - + $expires = '0000-00-00 00:00:00'; @@ -422,6 +422,13 @@ function item_post(&$a) { if($mimetype === 'text/bbcode') { + if(local_user() && local_user() == $profile_uid && get_pconfig(local_user(),'editor','use_markdown')) { + require_once('include/bb2diaspora.php'); + $body = diaspora2bb($body,true); + } + + + // 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 |