Merge pull request #650 from helsingborg-stad/3.0/fix/quicklinks-notices

Fix: Quicklinks notice + post notice
helsingborg-stad · Sep 8, 2023 · 6eb3945 · 6eb3945
2 parents 49dccea + cff60e8
commit 6eb3945
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/library/Helper/Post.php b/library/Helper/Post.php
@@ -58,7 +58,7 @@ public static function complementObject($postObject, $appendFields = [], $data =
         $postObject->quicklinksPlacement = Navigation::getQuicklinksPlacement($postObject->ID);
         $postObject->hasQuicklinksAfterFirstBlock = false;
         $postObject->displayQuicklinksAfterContent = Navigation::displayQuicklinksAfterContent($postObject->ID);
-        if ($postObject->quicklinksPlacement == 'after_first_block' && has_blocks($postObject->post_content) && isset($data['quicklinksMenuItems'])) {
+        if (!empty($postObject->quicklinksPlacement) && $postObject->quicklinksPlacement == 'after_first_block' && has_blocks($postObject->post_content) && isset($data['quicklinksMenuItems'])) {
             $postObject->displayQuicklinksAfterContent = false;
             // Add quicklinks after first block
             foreach (parse_blocks($postObject->post_content) as $key => $block) {

diff --git a/views/v3/partials/navigation/fixed.blade.php b/views/v3/partials/navigation/fixed.blade.php
@@ -1,4 +1,4 @@
-@if (!empty($quicklinksMenuItems) && $quicklinksPlacement !== 'after_first_block')
+@if (!empty($quicklinksMenuItems) && !empty($quicklinksPlacement) && $quicklinksPlacement !== 'after_first_block')
     @if (($customizer->quicklinksLocation == 'frontpage' && $isFrontPage) || $customizer->quicklinksLocation == 'everywhere')
         @header([
             'id' => 'quicklinks-header',