diff --git a/src/Module/Item/Display.php b/src/Module/Item/Display.php index 42112a3e0..df500f7cc 100644 --- a/src/Module/Item/Display.php +++ b/src/Module/Item/Display.php @@ -136,7 +136,7 @@ class Display extends BaseModule } if ($item['gravity'] != Item::GRAVITY_PARENT) { - $parent = Post::selectFirstForUser($itemUid, $fields, [ + $parent = Post::selectFirst($fields, [ 'uid' => [0, $itemUid], 'uri-id' => $item['parent-uri-id'] ], ['order' => ['uid' => true]]); @@ -249,7 +249,15 @@ class Display extends BaseModule $item = Post::selectFirstForUser($pageUid, $fields, $condition); if (empty($item)) { - throw new HTTPException\NotFoundException($this->t('The requested item doesn\'t exist or has been deleted.')); + $this->page['aside'] = ''; + throw new HTTPException\NotFoundException($this->t('Unfortunately, the requested conversation isn\'t available to you.

+

Possible reasons include:

+

')); } $item['uri-id'] = $item['parent-uri-id']; diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po index 0428ba590..cbd26b59a 100644 --- a/view/lang/C/messages.po +++ b/view/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 2022.12-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-11-19 07:52-0500\n" +"POT-Creation-Date: 2022-11-19 12:01-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -7089,11 +7089,24 @@ msgid "" "Theme Customization settings." msgstr "" -#: src/Module/Item/Display.php:135 src/Module/Item/Display.php:252 -#: src/Module/Update/Display.php:55 +#: src/Module/Item/Display.php:135 src/Module/Update/Display.php:55 msgid "The requested item doesn't exist or has been deleted." msgstr "" +#: src/Module/Item/Display.php:253 +msgid "" +"Unfortunately, the requested conversation isn't available to you.

\n" +"

Possible reasons include:

\n" +"

" +msgstr "" + #: src/Module/Item/Feed.php:86 msgid "The feed for this item is unavailable." msgstr "" diff --git a/view/templates/exception.tpl b/view/templates/exception.tpl index 0456136bc..ad1a15f87 100644 --- a/view/templates/exception.tpl +++ b/view/templates/exception.tpl @@ -1,7 +1,7 @@

{{$title}}

-

{{$message}}

+

{{$message nofilter}}

{{if $thrown}}
{{$thrown}}
 {{$stack_trace}}