Merge pull request #4675 from annando/group-delete

[friendica.git] / src / Content / Text / BBCode.php

diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php
index 82c6f46980cbc8f5ab2f9e79e20626abb73172c4..ebaef2b29d1accf43625b1e56c9cdcafc7fb61e1 100644 (file)
--- a/src/Content/Text/BBCode.php
+++ b/src/Content/Text/BBCode.php
@@ -20,6 +20,7 @@ use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Model\Contact;
+use Friendica\Model\Event;
 use Friendica\Network\Probe;
 use Friendica\Object\Image;
 use Friendica\Util\Map;
@@ -27,7 +28,6 @@ use Friendica\Util\Network;
 use Friendica\Util\ParseUrl;
 use League\HTMLToMarkdown\HtmlConverter;
 
-require_once "include/event.php";
 require_once "mod/proxy.php";
 
 class BBCode extends BaseObject
@@ -1373,7 +1373,7 @@ class BBCode extends BaseObject
                // After we're finished processing the bbcode we'll
                // replace all of the event code with a reformatted version.
 
-               $ev = bbtoevent($text);
+               $ev = Event::fromBBCode($text);
 
                // Replace any html brackets with HTML Entities to prevent executing HTML or script
                // Don't use strip_tags here because it breaks [url] search by replacing & with amp
@@ -1811,7 +1811,7 @@ class BBCode extends BaseObject
                // start which is always required). Allow desc with a missing summary for compatibility.
 
                if ((x($ev, 'desc') || x($ev, 'summary')) && x($ev, 'start')) {
-                       $sub = format_event_html($ev, $simple_html);
+                       $sub = Event::getHTML($ev, $simple_html);
 
                        $text = preg_replace("/\[event\-summary\](.*?)\[\/event\-summary\]/ism", '', $text);
                        $text = preg_replace("/\[event\-description\](.*?)\[\/event\-description\]/ism", '', $text);