From 81280a3a87695f53752a0d4f50071c98f122d962 Mon Sep 17 00:00:00 2001 From: Martin Kamerbeek Date: Mon, 16 Aug 2004 21:38:54 +0000 Subject: [PATCH] Fixed a bug where the GUID system caused pages with nonnumerical id's to be marked as system pages --- lib/WebGUI/Navigation.pm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/WebGUI/Navigation.pm b/lib/WebGUI/Navigation.pm index ebf7ff8a6..1e7da773d 100644 --- a/lib/WebGUI/Navigation.pm +++ b/lib/WebGUI/Navigation.pm @@ -255,9 +255,8 @@ sub build { $pageData->{"page.relDepth"} = $pageData->{"page.absDepth"} - $startPageDepth; $pageData->{"page.isCurrent"} = ($page->{'pageId'} == $session{page}{pageId}); $pageData->{"page.isHidden"} = $page->{'hideFromNavigation'}; - $pageData->{"page.isSystem"} = (($page->{'pageId'} < 1000 && $page->{'pageId'} > 1) || - $page->{'pageId'} == 0); - + $pageData->{"page.isSystem"} = ($page->{'pageId'} =~ /^\d+$/ && + ($page->{'pageId'} < 1000 && $page->{'pageId'} >= 0)); # indent my $indent = 0; @@ -286,7 +285,7 @@ sub build { # Check showSystemPages next if (! $self->{_showSystemPages} && $pageData->{"page.isSystem"}); - + # Deal with hidden pages next if($page->{'hideFromNavigation'} && ! $self->{_showHiddenPages});