diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/bbcode.php | 4 | ||||
| -rw-r--r-- | include/event.php | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/include/bbcode.php b/include/bbcode.php index e0a0fe9a1..fb10ceb4a 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -1097,6 +1097,10 @@ function parseIdentityAwareHTML($Text) { function bbcode($Text, $options = []) { + if (!$Text) { + return EMPTY_STR; + } + if(! is_array($options)) { $options = []; } diff --git a/include/event.php b/include/event.php index 745469064..da504c2d7 100644 --- a/include/event.php +++ b/include/event.php @@ -58,7 +58,9 @@ function format_event_html($ev) { $ev['dtend'] , $bd_format ))) . '</span></div>' . "\r\n"; - $o .= '<div class="event-description">' . zidify_links(smilies(bbcode($ev['description']))) . '</div>' . "\r\n"; + if (!empty($ev['description'])) { + $o .= '<div class="event-description">' . zidify_links(smilies(bbcode($ev['description']))) . '</div>' . "\r\n"; + } if(isset($ev['location']) && $ev['location']) $o .= '<div class="event-location"><span class="event-label"> ' . t('Location:') . '</span> <span class="location">' @@ -117,6 +119,7 @@ function format_event_obj($jobject) { $dtdiff = $dtstart->diff($dtend_obj); + $oneday = false; if($allday && ($dtdiff->days < 2)) $oneday = true; |