From b1e9169a4f684730bfb3ea998ade68fe5f4fb9c8 Mon Sep 17 00:00:00 2001
From: Doug Bell <doug@plainblack.com>
Date: Thu, 25 Jan 2007 02:33:31 +0000
Subject: [PATCH] Fixes for upgrade problems.

---
 docs/gotcha.txt                      | 10 ++++++++++
 docs/upgrades/upgrade_7.2.3-7.3.0.pl |  4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/docs/gotcha.txt b/docs/gotcha.txt
index 53766ca7b..132ac8872 100644
--- a/docs/gotcha.txt
+++ b/docs/gotcha.txt
@@ -7,6 +7,16 @@ upgrading from one version to the next, or even between multiple
 versions. Be sure to heed the warnings contained herein as they will
 save you many hours of grief.
 
+7.3.7
+--------------------------------------------------------------------
+ * For those who performed a multiple site upgrade from 7.2.3 to 
+   7.3.1 or higher and began having problems with navigation and 
+   calendar wobjects, you can fix those problems by restoring your 
+   7.2.3 database, restoring the 7.2.3 WebGUI source, re-applying 
+   the 7.3.7 WebGUI code, and running the upgrade again.
+   If you are not affected by these problems, you do not need to 
+   restore.
+
 7.3.5
 --------------------------------------------------------------------
  * Template variables used in templates that use XML, or that are used
diff --git a/docs/upgrades/upgrade_7.2.3-7.3.0.pl b/docs/upgrades/upgrade_7.2.3-7.3.0.pl
index e9183f8bd..213cda892 100644
--- a/docs/upgrades/upgrade_7.2.3-7.3.0.pl
+++ b/docs/upgrades/upgrade_7.2.3-7.3.0.pl
@@ -259,8 +259,8 @@ sub migrateCalendars {
 			#use Data::Dumper;
 			#warn Dumper \%eventProperties;
 			
-			$newAsset->addChild(\%eventProperties);
-			
+            $newAsset->addChild(\%eventProperties,undef,undef,{skipAutoCommitWorkflows=>1});
+
 			# Remove this event from the old calendar
 			$session->db->write("delete from EventsCalendar_event where assetId=?",[$event]);
 			$session->db->write("delete from asset where assetId=?",[$event]);