[3] Routing: Fix notice in NoMenuRule (#34049)

Hackwar · richard67 · web-flow · commit 95d8d44db700 · 2021-06-10T20:06:55.000+02:00
* Checking if option in query is set

Co-authored-by: Richard Fath &lt;richard67@users.noreply.github.com&gt;
diff --git a/libraries/src/Component/Router/Rules/NomenuRules.php b/libraries/src/Component/Router/Rules/NomenuRules.php
@@ -101,7 +101,8 @@ public function build(&$query, &$segments)
 		{
 			$item = $this->router->menu->getItem($query['Itemid']);
 
-			if (!isset($query['option']) || ($item && $item->query['option'] === $query['option']))
+			if (!isset($query['option'])
+				|| ($item && isset($item->query['option']) && $item->query['option'] === $query['option']))
 			{
 				$menu_found = true;
 			}

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,8 @@ public function build(&$query, &$segments)`
`101`	`101`	`{`
`102`	`102`	`$item = $this->router->menu->getItem($query['Itemid']);`
`103`	`103`
`104`		`- if (!isset($query['option']) \|\| ($item && $item->query['option'] === $query['option']))`
	`104`	`+ if (!isset($query['option'])`
	`105`	`+ \|\| ($item && isset($item->query['option']) && $item->query['option'] === $query['option']))`
`105`	`106`	`{`
`106`	`107`	`$menu_found = true;`
`107`	`108`	`}`