From 3433c7c33289d33592d32b67f348dc26507492b4 Mon Sep 17 00:00:00 2001
From: Graham Knop <graham@plainblack.com>
Date: Tue, 3 Feb 2009 23:28:25 +0000
Subject: [PATCH] fixed #9542: Default WebGUI config contains invalid workflow
 activity

---
 docs/changelog/7.x.x.txt               |  1 +
 docs/upgrades/upgrade_7.6.10-7.6.11.pl | 14 ++++++++++++--
 etc/WebGUI.conf.original               |  2 --
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 0ed5ec2da..df6688c4a 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -13,6 +13,7 @@
  - fixed: Many child assets, including WikiPage, Post and Event, will no longer let you add or paste them in places where they do not belong.
  - fixed: Hardcoded extras url in templates and in extra head tags in assets were replaced with the Extras macro.
  - fixed: Fixed bad gateway macros in the Matrix templates.
+ - fixed #9542: Default WebGUI config contains invalid workflow activity
 
 7.6.10
  - fixed #9577: WebGUI::Form::Url::getValue returns blank rather than undef for blank fields
diff --git a/docs/upgrades/upgrade_7.6.10-7.6.11.pl b/docs/upgrades/upgrade_7.6.10-7.6.11.pl
index 17baf6511..aef14ad85 100644
--- a/docs/upgrades/upgrade_7.6.10-7.6.11.pl
+++ b/docs/upgrades/upgrade_7.6.10-7.6.11.pl
@@ -33,8 +33,7 @@ my $session = start(); # this line required
 hideGalleryAlbums($session);
 removeBrokenWorkflowInstances($session);
 undotBinaryExtensions($session);
-
-# upgrade functions go here
+removeProcessRecurringPaymentsFromConfig($session);
 
 finish($session); # this line required
 
@@ -48,6 +47,17 @@ finish($session); # this line required
 #    print "DONE!\n" unless $quiet;
 #}
 
+#----------------------------------------------------------------------------
+sub removeProcessRecurringPaymentsFromConfig {
+    my $session = shift;
+    print "\tRemoving old ProcessRecurringPayments workflow activity from config..." unless $quiet;
+
+    $session->config->deleteFromArray('workflowActivities/None',
+        'WebGUI::Workflow::Activity::ProcessRecurringPayments');
+
+    print "Done.\n" unless $quiet;
+}
+
 #----------------------------------------------------------------------------
 sub hideGalleryAlbums {
     my $session = shift;
diff --git a/etc/WebGUI.conf.original b/etc/WebGUI.conf.original
index d54865761..8d553f304 100644
--- a/etc/WebGUI.conf.original
+++ b/etc/WebGUI.conf.original
@@ -533,7 +533,6 @@
       "category" : "utilities"
    },
    "WebGUI::Asset::Sku::Product" : {
-      "isContainer" : 1,
       "category" : "shop"
    },
    "WebGUI::Asset::Wobject::WeatherData" : {
@@ -803,7 +802,6 @@
         "WebGUI::Workflow::Activity::ExpireSubscriptionCodes",
         "WebGUI::Workflow::Activity::GetSyndicatedContent",
         "WebGUI::Workflow::Activity::NotifyAdminsWithOpenVersionTags",
-        "WebGUI::Workflow::Activity::ProcessRecurringPayments",
         "WebGUI::Workflow::Activity::PurgeOldAssetRevisions",
         "WebGUI::Workflow::Activity::PurgeOldTrash",
         "WebGUI::Workflow::Activity::SendQueuedMailMessages",