Fix: Events on Diaspora now should look fine

[friendica.git] / include / event.php

diff --git a/include/event.php b/include/event.php
index c49c9220f2b1bd85b1af3b2140825bb57fdf2e9e..9172e3ecca229df592fc07cf252269b8479f2c27 100644 (file)
--- a/include/event.php
+++ b/include/event.php
@@ -38,9 +38,9 @@ function format_event_html($ev, $simple = false) {
        );
 
        if ($simple) {
-               $o = "<h3>" . BBCode::convert($ev['summary']) . "</h3>";
+               $o = "<h3>" . BBCode::convert($ev['summary'], false, $simple) . "</h3>";
 
-               $o .= "<p>" . BBCode::convert($ev['desc']) . "</p>";
+               $o .= "<p>" . BBCode::convert($ev['desc'], false, $simple) . "</p>";
 
                $o .= "<h4>" . L10n::t('Starts:') . "</h4><p>" . $event_start . "</p>";
 
@@ -49,7 +49,7 @@ function format_event_html($ev, $simple = false) {
                }
 
                if (strlen($ev['location'])) {
-                       $o .= "<h4>" . L10n::t('Location:') . "</h4><p>" . BBCode::convert($ev['location']) . "</p>";
+                       $o .= "<h4>" . L10n::t('Location:') . "</h4><p>" . BBCode::convert($ev['location'], false, $simple) . "</p>";
                }
 
                return $o;
@@ -57,7 +57,7 @@ function format_event_html($ev, $simple = false) {
 
        $o = '<div class="vevent">' . "\r\n";
 
-       $o .= '<div class="summary event-summary">' . BBCode::convert($ev['summary']) . '</div>' . "\r\n";
+       $o .= '<div class="summary event-summary">' . BBCode::convert($ev['summary'], false, $simple) . '</div>' . "\r\n";
 
        $o .= '<div class="event-start"><span class="event-label">' . L10n::t('Starts:') . '</span>&nbsp;<span class="dtstart" title="'
                . DateTimeFormat::utc($ev['start'], (($ev['adjust']) ? DateTimeFormat::ATOM : 'Y-m-d\TH:i:s' ))
@@ -71,16 +71,16 @@ function format_event_html($ev, $simple = false) {
                        . '</span></div>' . "\r\n";
        }
 
-       $o .= '<div class="description event-description">' . BBCode::convert($ev['desc']) . '</div>' . "\r\n";
+       $o .= '<div class="description event-description">' . BBCode::convert($ev['desc'], false, $simple) . '</div>' . "\r\n";
 
        if (strlen($ev['location'])) {
                $o .= '<div class="event-location"><span class="event-label">' . L10n::t('Location:') . '</span>&nbsp;<span class="location">'
-                       . BBCode::convert($ev['location'])
+                       . BBCode::convert($ev['location'], false, $simple)
                        . '</span></div>' . "\r\n";
 
                // Include a map of the location if the [map] BBCode is used.
                if (strpos($ev['location'], "[map") !== false) {
-                       $map = Map::byLocation($ev['location']);
+                       $map = Map::byLocation($ev['location'], $simple);
                        if ($map !== $ev['location']) {
                                $o.= $map;
                        }