From 6ed1a66b66254e7d33eb9fe8af17bf079d0c0870 Mon Sep 17 00:00:00 2001
From: Matthew Wilson <matt@plainblack.com>
Date: Wed, 24 Aug 2005 01:57:56 +0000
Subject: [PATCH]  - fix [ 1177447 ] deployPackage does not retain content pos.
 for dupl. layouts

---
 lib/WebGUI/AdminConsole.pm |  2 --
 lib/WebGUI/AssetBranch.pm  | 10 +++++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/lib/WebGUI/AdminConsole.pm b/lib/WebGUI/AdminConsole.pm
index e4bdff799..7d5498fb1 100644
--- a/lib/WebGUI/AdminConsole.pm
+++ b/lib/WebGUI/AdminConsole.pm
@@ -67,10 +67,8 @@ sub _formatFunction {
 	my $url;
 	if (exists $function->{func}) {
 		$url = WebGUI::URL::page("func=".$function->{func});
-		$url = '#' if $session{form}{func} eq $function->{func};
 	} else {
 		$url = WebGUI::URL::page("op=".$function->{op});
-		$url = '#' if $session{form}{op} eq $function->{op};
 	}
 	return {
 		title=>WebGUI::International::get($function->{title}{id}, $function->{title}{namespace}),
diff --git a/lib/WebGUI/AssetBranch.pm b/lib/WebGUI/AssetBranch.pm
index 060d9617e..63e62980a 100644
--- a/lib/WebGUI/AssetBranch.pm
+++ b/lib/WebGUI/AssetBranch.pm
@@ -53,9 +53,17 @@ sub duplicateBranch {
 	my $self = shift;
 	my $assetToDuplicate = shift || $self;
 	my $newAsset = $self->duplicate($assetToDuplicate);
+	my $contentPositions;
+	$contentPositions = $assetToDuplicate->get("contentPositions");
 	foreach my $child (@{$assetToDuplicate->getLineage(["children"],{returnObjects=>1})}) {
-		$newAsset->duplicateBranch($child);
+		my $newChild = $newAsset->duplicateBranch($child);
+		if ($contentPositions) {
+			my $newChildId = $newChild->getId;
+			my $oldChildId = $child->getId;
+			$contentPositions =~ s/${oldChildId}/${newChildId}/g;
+		}
 	}
+	$newAsset->update({contentPositions=>$contentPositions}) if $contentPositions;
 	return $newAsset;
 }