Fix active state for menu

Thomas Jarrand · Thomas Jarrand · commit 6b54af7a0a05 · 2021-05-14T10:01:15.000+02:00
diff --git a/Menu/Builder.php b/Menu/Builder.php
@@ -65,11 +65,19 @@ private function resolve(array $item, array $keys)
 
     public function isCurrentRoot(?string $root): bool
     {
+        if (is_null($root)) {
+            return false;
+        }
+
         return $this->getCurrentAttribute('_menu_root') === $root;
     }
 
     public function isCurrentBranch(?string $branch): bool
     {
+        if (is_null($branch)) {
+            return false;
+        }
+
         return $this->getCurrentAttribute('_menu_branch') === $branch;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -65,11 +65,19 @@ private function resolve(array $item, array $keys)`
`65`	`65`
`66`	`66`	`public function isCurrentRoot(?string $root): bool`
`67`	`67`	`{`
	`68`	`+ if (is_null($root)) {`
	`69`	`+ return false;`
	`70`	`+ }`
	`71`	`+`
`68`	`72`	`return $this->getCurrentAttribute('_menu_root') === $root;`
`69`	`73`	`}`
`70`	`74`
`71`	`75`	`public function isCurrentBranch(?string $branch): bool`
`72`	`76`	`{`
	`77`	`+ if (is_null($branch)) {`
	`78`	`+ return false;`
	`79`	`+ }`
	`80`	`+`
`73`	`81`	`return $this->getCurrentAttribute('_menu_branch') === $branch;`
`74`	`82`	`}`
`75`	`83`