diff options
| author | zotlabs <mike@macgirvin.com> | 2017-03-05 14:47:20 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-03-05 14:47:20 -0800 |
| commit | c533c62c640cf081c44bf0489680ee3be3e45ecb (patch) | |
| tree | 7b23c066856ad4531652fc162f9527d556a6b19f /include | |
| parent | 384db9d10dbded64e83564daa4c51dac05674a2b (diff) | |
| download | volse-hubzilla-c533c62c640cf081c44bf0489680ee3be3e45ecb.tar.gz volse-hubzilla-c533c62c640cf081c44bf0489680ee3be3e45ecb.tar.bz2 volse-hubzilla-c533c62c640cf081c44bf0489680ee3be3e45ecb.zip | |
some event work
Diffstat (limited to 'include')
| -rw-r--r-- | include/bbcode.php | 1 | ||||
| -rw-r--r-- | include/event.php | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/include/bbcode.php b/include/bbcode.php index c0033f280..5aa61760f 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -1174,6 +1174,7 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $cache = false) $Text = preg_replace("/\[event\-start\](.*?)\[\/event\-start\]/ism",$sub,$Text); + $Text = preg_replace("/\event\](.*?)\[\/event\]/ism",'',$Text); $Text = preg_replace("/\[event\-summary\](.*?)\[\/event\-summary\]/ism",'',$Text); $Text = preg_replace("/\[event\-description\](.*?)\[\/event\-description\]/ism",'',$Text); $Text = preg_replace("/\[event\-finish\](.*?)\[\/event\-finish\]/ism",'',$Text); diff --git a/include/event.php b/include/event.php index a9634d7a5..726eb667c 100644 --- a/include/event.php +++ b/include/event.php @@ -210,6 +210,10 @@ function format_event_bbcode($ev) { $o = ''; + if($ev['event_vdata']) { + $o .= '[event]' . $ev['event_vdata'] . '[/event]'; + } + if($ev['summary']) $o .= '[event-summary]' . $ev['summary'] . '[/event-summary]'; |