Merge pull request #4554 from annando/avoid-deflate

[friendica.git] / mod / display.php

diff --git a/mod/display.php b/mod/display.php
index eb196b0979671d808b49045ef87f72c2bd127f67..0cc15aa360bca636dc2aaa828c003df1fb53e701 100644 (file)
--- a/mod/display.php
+++ b/mod/display.php
@@ -4,6 +4,7 @@
  */
 
 use Friendica\App;
+use Friendica\Content\Text\BBCode;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\Protocol;
@@ -210,7 +211,11 @@ function display_content(App $a, $update = false, $update_uid = 0) {
        if ($update) {
                $item_id = $_REQUEST['item_id'];
                $item = dba::selectFirst('item', ['uid', 'parent'], ['id' => $item_id]);
-               $a->profile = ['uid' => intval($item['uid']), 'profile_uid' => intval($item['uid'])];
+               if ($item['uid'] != 0) {
+                       $a->profile = ['uid' => intval($item['uid']), 'profile_uid' => intval($item['uid'])];
+               } else {
+                       $a->profile = ['uid' => intval($update_uid), 'profile_uid' => intval($update_uid)];
+               }
                $item_parent = $item['parent'];
        } else {
                $item_id = (($a->argc > 2) ? $a->argv[2] : 0);
@@ -366,10 +371,10 @@ function display_content(App $a, $update = false, $update_uid = 0) {
        $o .= conversation($a, $items, 'display', $update_uid);
 
        // Preparing the meta header
-       require_once 'include/bbcode.php';
        require_once 'include/html2plain.php';
-       $description = trim(html2plain(bbcode($s[0]["body"], false, false), 0, true));
-       $title = trim(html2plain(bbcode($s[0]["title"], false, false), 0, true));
+
+       $description = trim(html2plain(BBCode::convert($s[0]["body"], false), 0, true));
+       $title = trim(html2plain(BBCode::convert($s[0]["title"], false), 0, true));
        $author_name = $s[0]["author-name"];
 
        $image = $a->remove_baseurl($s[0]["author-thumb"]);