fix: school notices (#751)

* fix: resource taxonomies missing labels * fix: notice when secondaryMenuItems not set * fix: notice when eventsTitle not set * fix: notice when taxonomy does not exist
helsingborg-stad · Nov 9, 2023 · 6c14e5c · 6c14e5c
1 parent bdad6de
commit 6c14e5c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/library/Content/ResourceFromApi/Taxonomy/TaxonomyRegistrar.php b/library/Content/ResourceFromApi/Taxonomy/TaxonomyRegistrar.php
@@ -111,8 +111,14 @@ private function prepareArguments(): void
      */
     private function prepareLabels(array $arguments): array
     {
+        $arguments['labels'] = [];
+
+        if( isset($arguments['labels_name']) && !empty($arguments['labels_name']) ) {
+            $arguments['labels']['name'] = $arguments['labels_name'];
+        }
+
         if (isset($arguments['labels_singular_name']) && !empty($arguments['labels_singular_name'])) {
-            $arguments['labels'] = ['singular_name' => $arguments['labels_singular_name']];
+            $arguments['labels']['singular_name'] = $arguments['labels_singular_name'];
         }
 
         return $arguments;

diff --git a/library/Controller/BaseController.php b/library/Controller/BaseController.php
@@ -118,6 +118,7 @@ public function __construct()
 
         //Main Navigation
         $this->data['primaryMenuItems']             = $primary->getMenuItems('main-menu', $this->getPageID(), \Kirki::get_option('primary_menu_pagetree_fallback'), true, !$this->data['customizer']->primaryMenuDropdown);
+        $this->data['secondaryMenuItems'] = null;
 
         /**
          * Get the secondary menu items based on the content type or post type.

diff --git a/library/Controller/ContentType/School/SchoolDataPreparer.php b/library/Controller/ContentType/School/SchoolDataPreparer.php
@@ -549,6 +549,7 @@ private function attachmentToSliderItem($attachment): array
     private function appendEventData()
     {
         $this->data['events'] = null;
+        $this->data['eventsTitle'] = null;
 
         if( !post_type_exists(self::EVENT_POST_TYPE) || !taxonomy_exists(self::EVENT_TAXONOMY) ) {    
             return;

diff --git a/library/Helper/Post.php b/library/Helper/Post.php
@@ -317,7 +317,7 @@ protected static function getPostTerms($postId, $includeLink = true, $taxonomies
             foreach ($taxonomies as $taxonomy) {
                 $terms = wp_get_post_terms($postId, $taxonomy);
 
-                if (!empty($terms)) {
+                if (!is_wp_error($terms) && !empty($terms)) {
                     foreach ($terms as $term) {
                         $item = [];