diff options
| author | Max Kostikov <max@kostikov.co> | 2019-10-06 19:26:23 +0200 |
|---|---|---|
| committer | Max Kostikov <max@kostikov.co> | 2019-10-06 19:26:23 +0200 |
| commit | d017e34795f124ecf789d8a38b33e684ded6b7d2 (patch) | |
| tree | 3aebd8ccbd4a9944bc85bf3cc9c3880cb33b4681 /include/event.php | |
| parent | aa44da35bad02fda6c123a7961993ad687353031 (diff) | |
| parent | a435363b949021b1beeb7cb124668f672bf41ea2 (diff) | |
| download | volse-hubzilla-d017e34795f124ecf789d8a38b33e684ded6b7d2.tar.gz volse-hubzilla-d017e34795f124ecf789d8a38b33e684ded6b7d2.tar.bz2 volse-hubzilla-d017e34795f124ecf789d8a38b33e684ded6b7d2.zip | |
Merge branch 'dev' into 'dev'
Dev sync
See merge request kostikov/core!1
Diffstat (limited to 'include/event.php')
| -rw-r--r-- | include/event.php | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/event.php b/include/event.php index 6689919cf..6be1b6705 100644 --- a/include/event.php +++ b/include/event.php @@ -276,6 +276,9 @@ function format_event_bbcode($ev) { if($ev['event_hash']) $o .= '[event-id]' . $ev['event_hash'] . '[/event-id]'; + if($ev['timezone']) + $o .= '[event-timezone]' . $ev['timezone'] . '[/event-timezone]'; + if($ev['adjust']) $o .= '[event-adjust]' . $ev['adjust'] . '[/event-adjust]'; @@ -324,6 +327,9 @@ function bbtoevent($s) { if(preg_match("/\[event\-id\](.*?)\[\/event\-id\]/is",$s,$match)) $ev['event_hash'] = $match[1]; $match = ''; + if(preg_match("/\[event\-timezone\](.*?)\[\/event\-timezone\]/is",$s,$match)) + $ev['timezone'] = $match[1]; + $match = ''; if(preg_match("/\[event\-adjust\](.*?)\[\/event\-adjust\]/is",$s,$match)) $ev['adjust'] = $match[1]; if(array_key_exists('dtstart',$ev)) { |