Merge branch 'master' into develop

[friendica.git] / mod / display.php

diff --git a/mod/display.php b/mod/display.php
index 0cc15aa360bca636dc2aaa828c003df1fb53e701..eaf72c093ffb3b7a2a53962f8eaf0907d231c4f6 100644 (file)
--- a/mod/display.php
+++ b/mod/display.php
@@ -5,6 +5,8 @@
 
 use Friendica\App;
 use Friendica\Content\Text\BBCode;
+use Friendica\Content\Text\HTML;
+use Friendica\Core\ACL;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\Protocol;
@@ -204,7 +206,6 @@ function display_content(App $a, $update = false, $update_uid = 0) {
 
        require_once 'include/security.php';
        require_once 'include/conversation.php';
-       require_once 'include/acl_selectors.php';
 
        $o = '';
 
@@ -321,7 +322,7 @@ function display_content(App $a, $update = false, $update_uid = 0) {
                        'default_location' => $a->user['default-location'],
                        'nickname' => $a->user['nickname'],
                        'lockstate' => (is_array($a->user) && (strlen($a->user['allow_cid']) || strlen($a->user['allow_gid']) || strlen($a->user['deny_cid']) || strlen($a->user['deny_gid'])) ? 'lock' : 'unlock'),
-                       'acl' => populate_acl($a->user, true),
+                       'acl' => ACL::getFullSelectorHTML($a->user, true),
                        'bang' => '',
                        'visitor' => 'block',
                        'profile_uid' => local_user(),
@@ -371,10 +372,8 @@ function display_content(App $a, $update = false, $update_uid = 0) {
        $o .= conversation($a, $items, 'display', $update_uid);
 
        // Preparing the meta header
-       require_once 'include/html2plain.php';
-
-       $description = trim(html2plain(BBCode::convert($s[0]["body"], false), 0, true));
-       $title = trim(html2plain(BBCode::convert($s[0]["title"], false), 0, true));
+       $description = trim(HTML::toPlaintext(BBCode::convert($s[0]["body"], false), 0, true));
+       $title = trim(HTML::toPlaintext(BBCode::convert($s[0]["title"], false), 0, true));
        $author_name = $s[0]["author-name"];
 
        $image = $a->remove_baseurl($s[0]["author-thumb"]);