diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/datetime.php | 4 | ||||
| -rw-r--r-- | include/event.php | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/include/datetime.php b/include/datetime.php index 67c4f42fa..8f2ec311a 100644 --- a/include/datetime.php +++ b/include/datetime.php @@ -276,7 +276,7 @@ function get_first_dim($y,$m) { if(! function_exists('cal')) { -function cal($y = 0,$m = 0, $links = false) { +function cal($y = 0,$m = 0, $links = false, $class='') { // month table - start at 1 to match human usage. @@ -306,7 +306,7 @@ function cal($y = 0,$m = 0, $links = false) { $tddate = intval(datetime_convert('UTC',date_default_timezone_get(),'now','j')); $str_month = day_translate($mtab[$m]); - $o = '<table class="calendar">'; + $o = '<table class="calendar' . $class . '">'; $o .= "<caption>$str_month $y</caption><tr>"; for($a = 0; $a < 7; $a ++) $o .= '<th>' . mb_substr(day_translate($dn[$a]),0,3,'UTF-8') . '</th>'; diff --git a/include/event.php b/include/event.php index 21817086f..ecaa9213a 100644 --- a/include/event.php +++ b/include/event.php @@ -3,12 +3,14 @@ function format_event_html($ev) { + require_once('include/bbcode.php'); + if(! ((is_array($ev)) && count($ev))) return ''; $o = '<div class="vevent">'; - $o .= '<p class="description">' . $ev['desc'] . '</p>'; + $o .= '<p class="description">' . bbcode($ev['desc']) . '</p>'; $o .= '<p>' . t('Starts: ') . '<abbr class="dtstart" title="' . datetime_convert('UTC','UTC',$ev['start'], ATOM_TIME) @@ -25,7 +27,7 @@ function format_event_html($ev) { . '</abbr></p>'; $o .= '<p> ' . t('Location:') . '<span class="location">' - . $ev['location'] + . bbcode($ev['location']) . '</span></p>'; $o .= '</div>'; |