Merge pull request #4631 from friendica/fabrixxm-36rc-patch-1

[friendica.git] / include / event.php

diff --git a/include/event.php b/include/event.php
index c86ba732b8ef80ed26b59f762610d6dc8896e666..c49c9220f2b1bd85b1af3b2140825bb57fdf2e9e 100644 (file)
--- a/include/event.php
+++ b/include/event.php
@@ -16,7 +16,6 @@ use Friendica\Model\Profile;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Map;
 
-require_once 'include/bbcode.php';
 require_once 'include/conversation.php';
 
 function format_event_html($ev, $simple = false) {
@@ -41,7 +40,7 @@ function format_event_html($ev, $simple = false) {
        if ($simple) {
                $o = "<h3>" . BBCode::convert($ev['summary']) . "</h3>";
 
-               $o .= "<div>" . BBCode::convert($ev['desc']) . "</div>";
+               $o .= "<p>" . BBCode::convert($ev['desc']) . "</p>";
 
                $o .= "<h4>" . L10n::t('Starts:') . "</h4><p>" . $event_start . "</p>";
 
@@ -50,7 +49,7 @@ function format_event_html($ev, $simple = false) {
                }
 
                if (strlen($ev['location'])) {
-                       $o .= "<h4>" . L10n::t('Location:') . "</h4><p>" . $ev['location'] . "</p>";
+                       $o .= "<h4>" . L10n::t('Location:') . "</h4><p>" . BBCode::convert($ev['location']) . "</p>";
                }
 
                return $o;
@@ -239,7 +238,6 @@ function event_delete($event_id) {
 function event_store($arr) {
 
        require_once 'include/items.php';
-       require_once 'include/bbcode.php';
 
        $a = get_app();