From 0fb6d674ddc1f36d87ad29e269f3a168e90256ed Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Sat, 25 Sep 2004 05:51:31 +0000
Subject: [PATCH] fixed a guid bug in site map

---
 docs/changelog/6.x.x.txt      | 4 ++++
 lib/WebGUI/Wobject/SiteMap.pm | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index ac2c24d16..2922f2b79 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -1,3 +1,7 @@
+6.2.6
+ - Fixed a GUID bug in the Site Map wobject.
+
+
 6.2.5
  - Added missing upgrade file. This caused no harm to those that upgraded
    without it.
diff --git a/lib/WebGUI/Wobject/SiteMap.pm b/lib/WebGUI/Wobject/SiteMap.pm
index 573f141f7..34e160394 100644
--- a/lib/WebGUI/Wobject/SiteMap.pm
+++ b/lib/WebGUI/Wobject/SiteMap.pm
@@ -39,11 +39,11 @@ sub _traversePageTree {
                 if ($alphabetic) {
                         $orderBy = 'title';
                 } else {
-                        $orderBy = 'sequenceNumber';
+                        $orderBy = 'nestedSetLeft';
                 }
-                $sth = WebGUI::SQL->read("select urlizedTitle, menuTitle, title, pageId, synopsis from page where parentId=".quote($parent)." and hideFromNavigation = 0 order by $orderBy");
+                $sth = WebGUI::SQL->read("select urlizedTitle, menuTitle, title, pageId, synopsis, isSystem from page where parentId=".quote($parent)." and hideFromNavigation = 0 order by $orderBy");
                 while ($data = $sth->hashRef) {
-                        if (($data->{pageId}<0 || $data->{pageId}>999 || $data->{pageId}==1) && WebGUI::Page::canView($data->{pageId})) {
+                        if (!$data->{isSystem} && WebGUI::Page::canView($data->{pageId})) {
 				push(@pages,{ 
                                 	"page.indent" => $indentString,
 					"page.url" => WebGUI::URL::gateway($data->{urlizedTitle}),