Merge 781b8b8 into c96b9f8

timber · Feb 13, 2023 · 6254b64 · 6254b64
2 parents c96b9f8 + 781b8b8
commit 6254b64
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/Menu.php b/src/Menu.php
@@ -252,7 +252,8 @@ protected function __construct(?WP_term $term, array $args)
         }
 
         // Set theme location if available
-        $this->theme_location = array_flip(get_nav_menu_locations())[$term->term_id] ?? null;
+        $locations = array_flip(array_filter(get_nav_menu_locations(), fn ($location) => is_string($location) || is_int($location)));
+        $this->theme_location = $locations[$term->term_id] ?? null;
         if ($this->theme_location) {
             $this->args->theme_location = $this->theme_location;
         }

diff --git a/tests/test-timber-menu.php b/tests/test-timber-menu.php
@@ -924,12 +924,16 @@ public function testGetCurrentTopLevelItem()
         $this->assertEquals($parent->link(), $top->link());
     }
 
+    /**
+     * @issue https://github.com/timber/timber/issues/2576
+     */
     public function testThemeLocationProperty()
     {
         $term = self::_createTestMenu();
         $menu_id = $term['term_id'];
 
         $this->registerNavMenus([
+            'primary' => null,
             'secondary' => $menu_id,
         ]);