Don't break when retrieving unknown site-wide text pages

CatoTH · Sep 15, 2024 · 29f91e1 · 29f91e1
1 parent becb984
commit 29f91e1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/models/db/ConsultationText.php b/models/db/ConsultationText.php
@@ -268,7 +268,7 @@ public static function getMenuEntries(?Site $site, ?Consultation $consultation):
     public static function getPageData(?Site $site, ?Consultation $consultation, string $pageKey): ConsultationText
     {
         $foundText = null;
-        if (!in_array($pageKey, static::getSitewidePages())) {
+        if (!in_array($pageKey, static::getSitewidePages()) && $consultation) {
             foreach ($consultation->texts as $text) {
                 if ($text->category === self::DEFAULT_CATEGORY && mb_strtolower($text->textId) === mb_strtolower($pageKey)) {
                     $foundText = $text;

diff --git a/views/pages/list.php b/views/pages/list.php
@@ -54,6 +54,7 @@
             foreach ($missing as $textId => $title) {
                 if ($textId === 'feeds') {
                     $url     = \app\components\UrlHelper::createUrl(['consultation/feeds']);
+                    $options = [];
                 } else {
                     $params = ['pages/show-page', 'pageSlug' => $textId];
                     if (!in_array($textId, ConsultationText::getSitewidePages())) {