Update function / rearrange tab order

[friendica.git] / src / Module / Item / Display.php

diff --git a/src/Module/Item/Display.php b/src/Module/Item/Display.php
index a0d1ecbf56d81263d3aca04b192bf4aa0357b985..714598a8e66814fa896c0e27010526749f58b5a0 100644 (file)
--- a/src/Module/Item/Display.php
+++ b/src/Module/Item/Display.php
@@ -88,8 +88,6 @@ class Display extends BaseModule
 
        protected function content(array $request = []): string
        {
-               header('Vary: Accept', false);
-
                if (ActivityPub::isRequest()) {
                        $this->baseUrl->redirect(str_replace('display/', 'objects/', $this->args->getQueryString()));
                }
@@ -135,7 +133,9 @@ class Display extends BaseModule
                }
 
                if (empty($item)) {
-                       throw new HTTPException\NotFoundException($this->t('The requested item doesn\'t exist or has been deleted.'));
+                       $this->page['aside'] = '';
+                       $displayNotFound = new DisplayNotFound($this->l10n, $this->baseUrl, $this->args, $this->logger, $this->profiler, $this->response, $this->server, $this->parameters);
+                       return $displayNotFound->content();
                }
 
                if ($item['gravity'] != Item::GRAVITY_PARENT) {
@@ -275,7 +275,7 @@ class Display extends BaseModule
                        $output .= $this->conversation->statusEditor([], 0, true);
                }
 
-               $output .= $this->conversation->create([$item], Conversation::MODE_DISPLAY, $updateUid, false, 'commented', $itemUid);
+               $output .= $this->conversation->render([$item], Conversation::MODE_DISPLAY, $updateUid, false, 'commented', $itemUid);
 
                return $output;
        }