From 3e168b1c875e7875f0872cf8f13ad1f81efe7d67 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Wed, 5 May 2010 11:50:31 -0700
Subject: [PATCH] Trap calls to newById inside getParent.  StoryArchive should
 use cloneFromDb.

---
 lib/WebGUI/Asset/Wobject/StoryArchive.pm | 2 +-
 lib/WebGUI/AssetLineage.pm               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/WebGUI/Asset/Wobject/StoryArchive.pm b/lib/WebGUI/Asset/Wobject/StoryArchive.pm
index 8b381d3ca..c33fa526f 100644
--- a/lib/WebGUI/Asset/Wobject/StoryArchive.pm
+++ b/lib/WebGUI/Asset/Wobject/StoryArchive.pm
@@ -306,7 +306,7 @@ sub getFolder {
     $oldVersionTag->setWorking() if $oldVersionTag;
 
     ##Get a new version of the asset from the db with the correct state
-    $folder = WebGUI::Asset->newByUrl($session, $folderUrl);
+    $folder = $folder->cloneFromDb();
     return $folder;
 }
 
diff --git a/lib/WebGUI/AssetLineage.pm b/lib/WebGUI/AssetLineage.pm
index 960ff71b1..2fb1d0b16 100644
--- a/lib/WebGUI/AssetLineage.pm
+++ b/lib/WebGUI/AssetLineage.pm
@@ -733,7 +733,7 @@ sub getParent {
     return $self if ($self->getId eq "PBasset000000000000001");
 
     unless ( $self->{_parent} ) {
-        $self->{_parent} = WebGUI::Asset->newById($self->session,$self->parentId);
+        $self->{_parent} = eval { WebGUI::Asset->newById($self->session, $self->parentId); };
     }
 
     return $self->{_parent};