moods

[friendica.git] / mod / events.php

diff --git a/mod/events.php b/mod/events.php
index 4a6d3f100e974e5b4ff9bfe73fcf8510bcbb12a3..c448dc0f2e459a38d6d3ef4769476712437b5da7 100755 (executable)
--- a/mod/events.php
+++ b/mod/events.php
@@ -120,7 +120,7 @@ function events_post(&$a) {
        $datarray['allow_gid'] = $str_group_allow;
        $datarray['deny_cid'] = $str_contact_deny;
        $datarray['deny_gid'] = $str_group_deny;
-       $datarray['private'] = $private_event;
+       $datarray['private'] = (($private_event) ? 1 : 0);
        $datarray['id'] = $event_id;
        $datarray['created'] = $created;
        $datarray['edited'] = $edited;
@@ -145,6 +145,9 @@ function events_content(&$a) {
        $htpl = get_markup_template('event_head.tpl');
        $a->page['htmlhead'] .= replace_macros($htpl,array('$baseurl' => $a->get_baseurl()));
 
+       $etpl = get_markup_template('event_end.tpl');
+       $a->page['end'] .= replace_macros($etpl,array('$baseurl' => $a->get_baseurl()));
+
        $o ="";
        // tabs
        $tabs = profile_tabs($a, True); 
@@ -280,10 +283,10 @@ function events_content(&$a) {
                                        
                                $last_date = $d;
                                $edit = ((! $rr['cid']) ? array($a->get_baseurl().'/events/event/'.$rr['id'],t('Edit event'),'','') : null);
-                               $title = strip_tags(bbcode($rr['summary']));
+                               $title = strip_tags(html_entity_decode(bbcode($rr['summary']),ENT_QUOTES,'UTF-8'));
                                if(! $title) {
                                        list($title, $_trash) = explode("<br",bbcode($rr['desc']),2);
-                                       $title = strip_tags($title);
+                                       $title = strip_tags(html_entity_decode($title,ENT_QUOTES,'UTF-8'));
                                }
                                $html = format_event_html($rr);
                                $rr['desc'] = bbcode($rr['desc']);