diff options
| -rw-r--r-- | app/Module/FrequentlyAskedQuestionsModule.php | 4 | ||||
| -rw-r--r-- | resources/views/modules/faq/config.phtml | 2 | ||||
| -rw-r--r-- | resources/views/modules/stories/config.phtml | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/app/Module/FrequentlyAskedQuestionsModule.php b/app/Module/FrequentlyAskedQuestionsModule.php index aafca4ef8a..6b0b4b31e5 100644 --- a/app/Module/FrequentlyAskedQuestionsModule.php +++ b/app/Module/FrequentlyAskedQuestionsModule.php @@ -391,7 +391,7 @@ class FrequentlyAskedQuestionsModule extends AbstractModule implements ModuleCon * @return Collection<int,object{ * block_id: int, * block_order: int, - * gedcom_id: int, + * gedcom_id: int|null, * header: string, * faqbody: string, * languages: string @@ -418,7 +418,7 @@ class FrequentlyAskedQuestionsModule extends AbstractModule implements ModuleCon ->map(static function (object $row): object { $row->block_id = (int) $row->block_id; $row->block_order = (int) $row->block_order; - $row->gedcom_id = (int) $row->gedcom_id; + $row->gedcom_id = $row->gedcom_id === null ? null : (int) $row->gedcom_id; return $row; }); diff --git a/resources/views/modules/faq/config.phtml b/resources/views/modules/faq/config.phtml index b05a3b31b7..78e99a673f 100644 --- a/resources/views/modules/faq/config.phtml +++ b/resources/views/modules/faq/config.phtml @@ -11,7 +11,7 @@ use Fisharebest\Webtrees\Tree; * @var array<int,object{ * block_id: int, * block_order: int, - * gedcom_id: int, + * gedcom_id: int|null, * header: string, * faqbody: string, * languages: string diff --git a/resources/views/modules/stories/config.phtml b/resources/views/modules/stories/config.phtml index ee26e521f0..f0586dbea1 100644 --- a/resources/views/modules/stories/config.phtml +++ b/resources/views/modules/stories/config.phtml @@ -10,10 +10,10 @@ use Fisharebest\Webtrees\Tree; use Illuminate\Support\Collection; /** - * @var Collection<int,object{block_id:int,xref:string,individual:Individual,title:string}> $stories - * @var string $title - * @var Tree $tree - * @var array<string> $tree_names + * @var Collection<int,object{block_id:int,xref:string,individual:Individual|null,title:string}> $stories + * @var string $title + * @var Tree $tree + * @var array<string> $tree_names */ ?> |