Merge branch 'master' into develop

[friendica.git] / src / Protocol / DFRN.php

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 2aa672ef6d737e6ec5674a33e04d080a6ef92f91..d1b5183a97fb91be7b8316a3fb7fb2ce49f659de 100644 (file)
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -11,6 +11,7 @@ namespace Friendica\Protocol;
 use Friendica\App;
 use Friendica\Content\OEmbed;
 use Friendica\Content\Text\BBCode;
+use Friendica\Content\Text\HTML;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
@@ -42,7 +43,6 @@ require_once "include/enotify.php";
 require_once "include/items.php";
 require_once "include/event.php";
 require_once "include/text.php";
-require_once "include/html2bbcode.php";
 
 /**
  * @brief This class contain functions to create and send DFRN XML files
@@ -2454,7 +2454,7 @@ class DFRN
                        $purifier = new HTMLPurifier($config);
                        $item['body'] = $purifier->purify($item['body']);
 
-                       $item['body'] = @html2bbcode($item['body']);
+                       $item['body'] = @HTML::toBBCode($item['body']);
                }
 
                /// @todo We should check for a repeated post and if we know the repeated author.