Fix commenting on public posts

[friendica.git] / include / conversation.php

diff --git a/include/conversation.php b/include/conversation.php
index b545445e4b25ed7e1266a63b6c9bffa27583951d..352060d7f246f17a88ea8eedc1811a07a4a192a2 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -481,7 +481,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
 
                                $body_html = Item::prepareBody($item, true, $preview);
 
-                               list($categories, $folders) = DI::contentItem()->determineCategoriesTerms($item);
+                               list($categories, $folders) = DI::contentItem()->determineCategoriesTerms($item, local_user());
 
                                if (!empty($item['content-warning']) && DI::pConfig()->get(local_user(), 'system', 'disable_cw', false)) {
                                        $title = ucfirst($item['content-warning']);
@@ -1068,11 +1068,14 @@ function format_activity(array $links, $verb, $id) {
 
 function status_editor(App $a, array $x = [], $notes_cid = 0, $popup = false)
 {
+       $user = User::getById($a->getLoggedInUserId(), ['uid', 'nickname', 'allow_location', 'default-location']);
+       if (empty($user['uid'])) {
+               return '';
+       }
+
        DI::profiler()->startRecording('rendering');
        $o = '';
 
-       $user = User::getById($a->getUserId(), ['uid', 'nickname', 'allow_location', 'default-location']);
-
        $x['allow_location']   = $x['allow_location']   ?? $user['allow_location'];
        $x['default_location'] = $x['default_location'] ?? $user['default-location'];
        $x['nickname']         = $x['nickname']         ?? $user['nickname'];