Fix build SEF URL for users registration view without own menu item

libraries/src/Router/SiteRouter.php

@@ -465,9 +465,6 @@ public function buildComponentPreprocess(&$router, &$uri)
 	 */
 	public function buildSefRoute(&$router, &$uri)
 	{
-		// Get the route
-		$route = $uri->getPath();
-
 		// Get the query data
 		$query = $uri->getQuery(true);
 
@@ -478,35 +475,29 @@ public function buildSefRoute(&$router, &$uri)
 
 		// Build the component route
 		$component = preg_replace('/[^A-Z0-9_\.-]/i', '', $query['option']);
-		$itemID    = !empty($query['Itemid']) ? $query['Itemid'] : null;
 		$crouter   = $this->getComponentRouter($component);
 		$parts     = $crouter->build($query);
 		$tmp       = trim(implode('/', $parts));
 
-		if (empty($query['Itemid']) && !empty($itemID))
-		{
-			$query['Itemid'] = $itemID;
-		}
+		$item = isset($query['Itemid']) ? $this->menu->getItem($query['Itemid']) : null;
 
 		// Build the application route
-		if (isset($query['Itemid']) && $item = $this->menu->getItem($query['Itemid']))
+		if ($item !== null && $query['option'] === $item->component)
 		{
-			if (is_object($item) && $query['option'] === $item->component)
+			if (!$item->home)
 			{
-				if (!$item->home)
-				{
-					$tmp = !empty($tmp) ? $item->route . '/' . $tmp : $item->route;
-				}
-
-				unset($query['Itemid']);
+				$tmp = $item->route . '/' . $tmp;
 			}
+
+			unset($query['Itemid']);
 		}
 		else
 		{
 			$tmp = 'component/' . substr($query['option'], 4) . '/' . $tmp;
 		}
 
-		$route .= '/' . $tmp;
+		// Get the route
+		$route = $uri->getPath() . '/' . $tmp;
 
 		// Unset unneeded query information
 		unset($query['option']);