From 0136abfbb97a690c8dbfe89d02b1f957db16f1fb Mon Sep 17 00:00:00 2001
From: Doug Bell <doug@plainblack.com>
Date: Wed, 24 Jan 2007 23:39:25 +0000
Subject: [PATCH] Fixed 7.3.0-7.3.1 upgrade script so that multisite upgrades
 don't fail

---
 docs/changelog/7.x.x.txt             | 2 ++
 docs/upgrades/upgrade_7.3.0-7.3.1.pl | 9 ---------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index eb6db9283..f53a62f35 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -2,6 +2,8 @@
  - Fixed a template variable rewriting problem with Template Toolkit.
  - Fixed a bug with dealing with CS posts via email where
    multipart/alternative messages would cause a blank post.
+ - Fixed the 7.3.0-7.3.1 upgrade script so it doesn't cause multi-site 
+   upgrades to fail.
 
 7.3.6
  - fix: Checkbox is no longer available when creating custom profile fields
diff --git a/docs/upgrades/upgrade_7.3.0-7.3.1.pl b/docs/upgrades/upgrade_7.3.0-7.3.1.pl
index c02c4d9c1..ae2b8f7d6 100644
--- a/docs/upgrades/upgrade_7.3.0-7.3.1.pl
+++ b/docs/upgrades/upgrade_7.3.0-7.3.1.pl
@@ -20,19 +20,10 @@ my $quiet; # this line required
 
 my $session = start(); # this line required
 
-cleanupEventsCalendar($session);
 
 finish($session); # this line required
 
 #-------------------------------------------------
-sub cleanupEventsCalendar {
-	my $session = shift;
-	print "\tRemoving the rest of the old EventsCalendar wobject\n" unless ($quiet);
-	unlink("../../lib/WebGUI/Asset/Wobject/EventsCalendar.pm");
-	unlink("../../lib/WebGUI/i18n/English/Asset_EventsCalendar.pm");
-	unlink("../../lib/WebGUI/Help/Asset_EventsCalendar.pm");
-	$session->config->deleteFromArray("assets","WebGUI::Asset::Wobject::EventsCalendar");
-}
 
 # ---- DO NOT EDIT BELOW THIS LINE ----