From 4ff015bda017489126269768eda8730ba17d47bf Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Wed, 12 Oct 2005 21:22:38 +0000
Subject: [PATCH] fixed [ 1315408 ] Navigation sometimes fails to use correct
 startpoint

---
 docs/changelog/6.x.x.txt               |  2 ++
 lib/WebGUI/Asset/Wobject/Navigation.pm | 12 +-----------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index f9306bcba..0922b48b4 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -1,5 +1,7 @@
 6.7.7
  - fix [ 1324128 ] Help: List of Available Macros not working
+ - fix [ 1315408 ] Navigation sometimes fails to use correct startpoint
+
 
 6.7.6
  - Fixed invalid i18n keys that were causing missing labels.
diff --git a/lib/WebGUI/Asset/Wobject/Navigation.pm b/lib/WebGUI/Asset/Wobject/Navigation.pm
index e22cd5c1d..5b90be7c1 100644
--- a/lib/WebGUI/Asset/Wobject/Navigation.pm
+++ b/lib/WebGUI/Asset/Wobject/Navigation.pm
@@ -317,17 +317,7 @@ sub view {
 			$start = WebGUI::Asset->newByLineage(substr($current->get("lineage"),0, ($self->get("startPoint") + 1) * 6));
 		}
 	} elsif ($self->get("startType") eq "relativeToCurrentUrl") {
-		if ($self->get("startPoint") < 0) { 
-			$start = WebGUI::Asset->newByLineage(substr($current->get("lineage"),0,
-				($current->getLineageLength - $self->get("startPoint") + 1) * 6))
-					if (($current->getLineageLength + $self->get("startPoint") + 1) * 6);
-		} elsif ($self->get("startPoint") > 0) { 
-			my $lineage = $current->get("lineage");
-			for (1..$self->get("startPoint")) {
-				$lineage .= $self->formatRank($_);
-			}
-			$start = WebGUI::Asset->newByLineage($lineage);
-		}
+		$start = WebGUI::Asset->newByLineage(substr($current->get("lineage"),0, ($current->getLineageLength + $self->get("startPoint")) * 6));
 	}
 	$start = $current unless (defined $start); # if none of the above results in a start point, then the current page must be it
 	my @includedRelationships = split("\n",$self->get("assetsToInclude"));