From e982302c2af7c1eb472ec5d5331e1b87094be83a Mon Sep 17 00:00:00 2001
From: Drake <drake@plainblack.com>
Date: Fri, 10 Nov 2006 18:29:37 +0000
Subject: [PATCH] Update changelog and gotchas, and hopefully final update to
 r3226 bugfixes in 7.2.0 upgrade script.

---
 docs/changelog/7.x.x.txt             | 2 +-
 docs/gotcha.txt                      | 4 ++++
 docs/upgrades/upgrade_7.1.3-7.2.0.pl | 6 +++---
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index a0faf5f77..15b567de2 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -4,7 +4,7 @@
  - Fixed bugs the SyncProfileToLdap workflow activity where it would ignore the
    ldapAlias config setting and it crash (Martin Kamerbeek / Procolix) 
  - fix: entry in error log of WebGUI
-
+ - Fixed part of RSSCapable addition upgrade script in 7.2.0.
 
 7.2.0
  - Added server side spellchecker (Martin Kamerbeek / Procolix)
diff --git a/docs/gotcha.txt b/docs/gotcha.txt
index e511f1439..d1e90ef57 100644
--- a/docs/gotcha.txt
+++ b/docs/gotcha.txt
@@ -9,6 +9,10 @@ save you many hours of grief.
 
 7.2.0
 --------------------------------------------------------------------
+ * NOTE: if you tried to upgrade to 7.2.0 and it failed during the
+   addition of RSS From Parent capability, there have been bugs fixed
+   in that section of the relevant upgrade script in 7.2.1.
+
  * Server side spellchecking has been added to this release. You must 
    install Text::Aspell, and any dictionary you like. If you want to 
    use spellchecking you have to setup the dictionaries you want your 
diff --git a/docs/upgrades/upgrade_7.1.3-7.2.0.pl b/docs/upgrades/upgrade_7.1.3-7.2.0.pl
index 61196de5b..3dab7354b 100644
--- a/docs/upgrades/upgrade_7.1.3-7.2.0.pl
+++ b/docs/upgrades/upgrade_7.1.3-7.2.0.pl
@@ -205,10 +205,10 @@ EOT
 		# Blah, some duplication with RSSCapable.pm.
 		my ($revisionDate) = $session->db->quickArray("SELECT MAX(revisionDate) FROM Collaboration WHERE assetId = ?", [$csId]);
 		my $cs = WebGUI::Asset->newByDynamicClass($session, $csId, $revisionDate);
-		if ($cs->isPrototype or not($cs->get('status') eq 'approved' or
-					    $cs->get('status') eq 'archived')) {
+		if ($cs->get('isPrototype') or not($cs->get('status') eq 'approved' or
+						   $cs->get('status') eq 'archived')) {
 			$cs->update({ rssCapableRssEnabled => 1, rssCapableRssFromParentId => undef });
-			if (!$cs->isPrototype) {
+			if (!$cs->get('isPrototype')) {
 				# Update the most recent published one too.
 				my $csp = WebGUI::Asset->newByDynamicClass($session, $csId);
 				if ($csp) {