From 89c4fa18ee2a22e685effacfe27ca2c7ddb1de99 Mon Sep 17 00:00:00 2001
From: trendschau <trendschau@gmail.com>
Date: Sun, 26 May 2024 22:47:24 +0200
Subject: [PATCH] 2.5.1 Fix base pages with title /content or /system

---
 system/typemill/Controllers/ControllerWebFrontend.php | 5 ++---
 system/typemill/Models/Navigation.php                 | 7 +++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/system/typemill/Controllers/ControllerWebFrontend.php b/system/typemill/Controllers/ControllerWebFrontend.php
index 1c0222d..61bee92 100644
--- a/system/typemill/Controllers/ControllerWebFrontend.php
+++ b/system/typemill/Controllers/ControllerWebFrontend.php
@@ -43,7 +43,7 @@ class ControllerWebFrontend extends Controller
 		$fullUrl  			= $urlinfo['baseurl'] . $url;
 
 
-	    # FIND THE PAGE/ITEM IN NAVIGATION
+		# FIND THE PAGE/ITEM IN NAVIGATION
 		if($url == '/')
 		{
 			$item 				= $navigation->getHomepageItem($urlinfo['baseurl']);
@@ -52,8 +52,7 @@ class ControllerWebFrontend extends Controller
 		}
 		else
 		{
-
-			$pageinfo 			= $navigation->getPageInfoForUrl($url, $urlinfo, $langattr);
+			$pageinfo 			= $navigation->getPageInfoForUrl($url, $urlinfo, $langattr);			
 
 		    if(!$pageinfo)
 		    {
diff --git a/system/typemill/Models/Navigation.php b/system/typemill/Models/Navigation.php
index c158d6d..2889dcd 100644
--- a/system/typemill/Models/Navigation.php
+++ b/system/typemill/Models/Navigation.php
@@ -173,11 +173,14 @@ class Navigation extends Folder
 
 	public function getPageInfoForUrl($url, $urlinfo, $langattr)
 	{
+		# fix for pages like /system/
+		$url = '/' . trim($url, '/');
+
 		# get the first level navigation
 		$firstLevelExtended = $this->getExtendedNavigation($urlinfo, $langattr, '/');
 
-		$firstUrlSegment = $this->getFirstUrlSegment($url);
-		$firstUrlSegment = '/' . $firstUrlSegment;
+		$firstUrlSegment 	= $this->getFirstUrlSegment($url);
+		$firstUrlSegment 	= '/' . $firstUrlSegment;
 
 		$pageinfo = $firstLevelExtended[$firstUrlSegment] ?? false;