diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-05-06 22:56:08 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-05-06 22:56:08 -0700 |
| commit | 90591bcbc9ddba44cd44fc8ce06014c5ef9443e4 (patch) | |
| tree | 7d0ec7f7fca1df6c41e15502f5bd29beb8b04055 | |
| parent | d01206af5ae7b939d0eff332f017e9511f77dbae (diff) | |
| download | volse-hubzilla-90591bcbc9ddba44cd44fc8ce06014c5ef9443e4.tar.gz volse-hubzilla-90591bcbc9ddba44cd44fc8ce06014c5ef9443e4.tar.bz2 volse-hubzilla-90591bcbc9ddba44cd44fc8ce06014c5ef9443e4.zip | |
missed one...
| -rw-r--r-- | include/bbcode.php | 2 | ||||
| -rwxr-xr-x | mod/events.php | 2 | ||||
| -rwxr-xr-x | view/tpl/email_notify_html.tpl | 2 |
3 files changed, 4 insertions, 2 deletions
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 @@ <body> <table style="border:1px solid #ccc; background-color: #FFFFFF; color: #000000;"> <tbody> - <tr><td colspan="2" style="background:##026D0D; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src='{{$siteurl}}/images/rm-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">{{$product}}</div><div style="clear: both;"></div></td></tr> + <tr><td colspan="2" style="background:#026D0D; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src='{{$siteurl}}/images/ghash-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">{{$product}}</div><div style="clear: both;"></div></td></tr> <tr><td style="padding-top:22px;" colspan="2">{{$preamble}}</td></tr> |