*** empty log message ***

docs/changelog/6.x.x.txt

@@ -18,6 +18,9 @@
  - fix [ 1265771 ] assets that were formerly packages are still on packageList
  - fix [ 1177447 ] deployPackage does not retain content pos. (mwilson)
  - fix [ 1256718 ] Assets disappear after changing page layout (mwilson)
+ - fix [ 1262002 ] no "next Thread" or "previous Thread" links (mwilson)
+ - fix [ 1252626 ] navigation relative to current url broken (mwilson)
+ - fix [ 1261994 ] getLineageLength (mwilson)
 
 
 6.7.1

lib/WebGUI/Asset/Wobject/Navigation.pm

@@ -317,8 +317,8 @@ sub view {
 	} 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
-				));
+				($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")) {

lib/WebGUI/AssetLineage.pm

@@ -419,7 +419,7 @@ sub getLineage {
 		$where .= ' and (asset.className in ('.quoteAndJoin($rules->{includeOnlyClasses}).'))';
 	}
 	## finish up our where clause
-	$where .= " and ".join(" or ",@whereModifiers) if (scalar(@whereModifiers));
+	$where .= ' and ('.join(" or ",@whereModifiers).')' if (scalar(@whereModifiers));
 	if (exists $rules->{whereClause}) {
 		$where .= ' and ('.$rules->{whereClause}.')';
 	}