mirror/php-typemill
1
0
Fork 0
mirror of https://github.com/typemill/typemill.git synced 2025-07-30 10:50:17 +02:00
Code Issues Releases Wiki Activity

2.5.1 Fix base pages with title /content or /system

Browse Source
This commit is contained in:
trendschau
2024-05-26 22:47:24 +02:00
parent 3180a931be
commit 89c4fa18ee
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
system/typemill/Controllers/ControllerWebFrontend.php
View File

@@ -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)
{

7
system/typemill/Models/Navigation.php
View File

@@ -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;