diff --git a/include/bbcode.php b/include/bbcode.php index b78566bfe..49dd4752d 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -383,6 +383,8 @@ function bb_sanitize_style($input) { function bb_observer($Text) { + $a = get_app(); + $observer = $a->get_observer(); if ((strpos($Text,'[/observer]') !== false) || (strpos($Text,'[/rpost]') !== false)) { diff --git a/mod/events.php b/mod/events.php index 289ddfb15..ba7ef6b7d 100755 --- a/mod/events.php +++ b/mod/events.php @@ -415,7 +415,7 @@ function events_content(&$a) { $last_date = $d; // FIXME - $edit = (($rr['item_flags'] & ITEM_WALL) ? array($a->get_baseurl().'/events/event/'.$rr['event_hash'],t('Edit event'),'','') : null); + $edit = ((intval($rr['item_wall'])) ? array($a->get_baseurl().'/events/event/'.$rr['event_hash'],t('Edit event'),'','') : null); $drop = array($a->get_baseurl().'/events/drop/'.$rr['event_hash'],t('Delete event'),'',''); $title = strip_tags(html_entity_decode(bbcode($rr['summary']),ENT_QUOTES,'UTF-8')); diff --git a/view/tpl/email_notify_html.tpl b/view/tpl/email_notify_html.tpl index cde2177b0..ae3e8c012 100755 --- a/view/tpl/email_notify_html.tpl +++ b/view/tpl/email_notify_html.tpl @@ -7,7 +7,7 @@ - +
{{$product}}
{{$product}}
{{$preamble}}