From 2c7f49be9a2b43ebf8cdac0a5dc92eba6728ebff Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Wed, 17 Jan 2007 18:24:15 +0000
Subject: [PATCH] Fixed a bug with RSS feed generation and attachments.

---
 docs/changelog/7.x.x.txt                  |  3 +++
 docs/credits.txt                          |  2 +-
 docs/upgrades/upgrade_7.2.3-7.3.0.pl      |  1 +
 lib/WebGUI/Asset/Wobject/Collaboration.pm | 18 ------------------
 lib/WebGUI/Utility.pm                     |  1 -
 5 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 8254e931f..f68cba6d6 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -17,6 +17,9 @@
         handling dynamic item plugins. (Martin Kamerbeek / Oqapi)
  - fix: Using double quote in Project Manager task name breaks javascript
    (perlDreamer Consulting LLC)
+ - Fixed a bug in the 7.2.3-7.3.0 upgrade script related to calendar
+   migration.
+ - Fixed a bug with RSS feed generation and attachments.
 
 7.3.4
  - fix: SQLForm - cannot add new asset (Martin Kamerbeek / Oqapi)
diff --git a/docs/credits.txt b/docs/credits.txt
index 4de6fa396..eb8411e7b 100644
--- a/docs/credits.txt
+++ b/docs/credits.txt
@@ -28,7 +28,7 @@ Contributing Developers..............Lucas Bartholemy
                                      Chris Jackson
                                      Roy Johnson / Plain Black
                                      Koen de Jonge / ProcoliX
-                                     Martin Kamerbeek / ProcoliX
+                                     Martin Kamerbeek / Oqapi
                                      Christian Kocourek
                                      John W. Krahn
                                      Len Kranendonk
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 e6c944748..e9183f8bd 100644
--- a/docs/upgrades/upgrade_7.2.3-7.3.0.pl
+++ b/docs/upgrades/upgrade_7.2.3-7.3.0.pl
@@ -220,6 +220,7 @@ sub migrateCalendars {
 	
 	for my $asset (@{$calendars})
 	{
+		next unless defined $asset;
 		my $properties	= {%{$asset->get}};
 		$properties->{defaultDate}	= delete $properties->{defaultMonth};
 		#warn "Found calendar ".$properties->{title};
diff --git a/lib/WebGUI/Asset/Wobject/Collaboration.pm b/lib/WebGUI/Asset/Wobject/Collaboration.pm
index 5ea64644a..b88aa4d9b 100644
--- a/lib/WebGUI/Asset/Wobject/Collaboration.pm
+++ b/lib/WebGUI/Asset/Wobject/Collaboration.pm
@@ -708,24 +708,6 @@ SQL
     return @posts;
 }
 
-#-------------------------------------------------------------------
-sub getRssItemsAttachments {
-	my $self = shift;
-	my $post = shift;
-	if ($post->get('storageId')) {
-		my $storage = $post->getStorageLocation;
-		my @attachments = map {
-			{ 
-				'attachment.url' => $storage->getUrl($_),
-				'attachment.path' => $storage->getPath($_),
-				'attachment.length' => $storage->getFileSize($_) 
-			}	
-		} @{$storage->getFiles};
-		return \@attachments;
- 	}
-	return [];
-}
-
 #-------------------------------------------------------------------
 sub getEditTabs {
 	my $self = shift;
diff --git a/lib/WebGUI/Utility.pm b/lib/WebGUI/Utility.pm
index eb2f1c580..dfea63cf4 100644
--- a/lib/WebGUI/Utility.pm
+++ b/lib/WebGUI/Utility.pm
@@ -47,7 +47,6 @@ This package provides miscellaneous but useful utilities to the WebGUI programme
  $string = makeCommaSafe($string);
  $string = makeTabSafe($string);
  $integer = randint($low,$high);
- randomizeArray(\@array);
  $hashRef = randomizeHash(\%hash);
  %hash = sortHash(%hash);
  %hash = sortHashDescending(%hash);