From f8c0cb1041318da49bf9ee3db222ca6cdb4a7897 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Tue, 13 Mar 2007 19:45:38 +0000
Subject: [PATCH] s/descendent/descendant/msg when calling getLineage

---
 docs/changelog/7.x.x.txt                    | 2 ++
 docs/upgrades/upgrade_7.2.3-7.3.0.pl        | 2 +-
 docs/upgrades/upgrade_7.3.8-7.3.9.pl        | 2 +-
 docs/upgrades/upgrade_7.3.9-7.3.10.pl       | 2 +-
 lib/WebGUI/Asset/Wobject/Calendar.pm        | 2 +-
 lib/WebGUI/AssetClipboard.pm                | 2 +-
 lib/WebGUI/i18n/English/Asset_Navigation.pm | 4 ++--
 7 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index ad8784a33..045807b18 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -45,6 +45,8 @@
  - rfe: Paginate "manageCommittedVersions" (perlDreamer Consulting, LLC)
  - rfe: manageCommittedVersions in reverse chronological order (perlDreamer Consulting, LLC)
  - fix: Deploy package with calendar
+ - fix: Mis-spelled argument to getLineage in Calendar, Clipboard and upgrade
+   scripts (Thanks to Matthew Wilson, Veradox)
 
 7.3.11
  - Added an option for enabling coverage tests to testCodebase.pl.
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 d6c5da523..b07739229 100644
--- a/docs/upgrades/upgrade_7.2.3-7.3.0.pl
+++ b/docs/upgrades/upgrade_7.2.3-7.3.0.pl
@@ -212,7 +212,7 @@ sub migrateCalendars {
 	
 	# For every EventsCalendar
 	#EventsCalendar.defaultMonth = Calendar.defaultDate
-	my $calendars	= WebGUI::Asset->getRoot($session)->getLineage(['descendents'],
+	my $calendars	= WebGUI::Asset->getRoot($session)->getLineage(['descendants'],
 		{
             statesToInclude     => ['published','trash','clipboard','clipboard-limbo','trash-limbo'],
             statusToInclude     => ['pending','approved','deleted','archived'],
diff --git a/docs/upgrades/upgrade_7.3.8-7.3.9.pl b/docs/upgrades/upgrade_7.3.8-7.3.9.pl
index 8be671ee5..f14c1685e 100644
--- a/docs/upgrades/upgrade_7.3.8-7.3.9.pl
+++ b/docs/upgrades/upgrade_7.3.8-7.3.9.pl
@@ -52,7 +52,7 @@ sub addThreadRatingColumn {
     $session->db->write("alter table Thread add column threadRating integer default 0");
     my $root = WebGUI::Asset->getRoot($session);
     my $threads = $root->getLineage(
-    	['descendents'],
+    	['descendants'],
         {
             returnObjects      => 1,
             includeOnlyClasses => ['WebGUI::Asset::Post::Thread'],
diff --git a/docs/upgrades/upgrade_7.3.9-7.3.10.pl b/docs/upgrades/upgrade_7.3.9-7.3.10.pl
index fcbc70b3f..6b12eba23 100644
--- a/docs/upgrades/upgrade_7.3.9-7.3.10.pl
+++ b/docs/upgrades/upgrade_7.3.9-7.3.10.pl
@@ -38,7 +38,7 @@ sub fixEventGroups {
     my $session     = shift;
     print "\tFixing Event groups for Events created since 7.3.0.....";
 
-	my $events = WebGUI::Asset->getRoot($session)->getLineage(['descendents'], {
+	my $events = WebGUI::Asset->getRoot($session)->getLineage(['descendants'], {
         statesToInclude     => ['published','trash','clipboard','clipboard-limbo','trash-limbo'],
         statusToInclude     => ['pending','approved','deleted','archived'],
         includeOnlyClasses  => ['WebGUI::Asset::Event'],
diff --git a/lib/WebGUI/Asset/Wobject/Calendar.pm b/lib/WebGUI/Asset/Wobject/Calendar.pm
index 6bb5d6c9e..619132d50 100644
--- a/lib/WebGUI/Asset/Wobject/Calendar.pm
+++ b/lib/WebGUI/Asset/Wobject/Calendar.pm
@@ -371,7 +371,7 @@ sub duplicate {
     my $newCalendar = $self->SUPER::duplicate(@_);
     
     # Duplicate the events in this calendar
-    my $events = $self->getLineage(["descendents"], {
+    my $events = $self->getLineage(["descendants"], {
             returnObjects       => 1,
             includeOnlyClasses  => ['WebGUI::Asset::Event'],
         });
diff --git a/lib/WebGUI/AssetClipboard.pm b/lib/WebGUI/AssetClipboard.pm
index f607b3e8b..0133da317 100644
--- a/lib/WebGUI/AssetClipboard.pm
+++ b/lib/WebGUI/AssetClipboard.pm
@@ -128,7 +128,7 @@ sub getAssetsInClipboard {
 
     my $root = WebGUI::Asset->getRoot($self->session);
     return $root->getLineage(
-       ["descendents", ],
+       ["descendants", ],
        {
            statesToInclude => ["clipboard"],
            returnObjects   => 1,
diff --git a/lib/WebGUI/i18n/English/Asset_Navigation.pm b/lib/WebGUI/i18n/English/Asset_Navigation.pm
index 3ed9df5ca..46073a8db 100644
--- a/lib/WebGUI/i18n/English/Asset_Navigation.pm
+++ b/lib/WebGUI/i18n/English/Asset_Navigation.pm
@@ -586,8 +586,8 @@ be useful, others may not.|,
 	},
 
 	'assetsToInclude' => {
-		message => q|An newline separated string containg the kids of assets to include in the Navigation, by relationship.  Ancestors, the asset itself, siblings, descendents and/or pedigree.|,
-		lastUpdated => 1164841201
+		message => q|An newline separated string containg the kids of assets to include in the Navigation, by relationship.  Ancestors, the asset itself, siblings, descendants and/or pedigree.|,
+		lastUpdated => 1173814820
 	},
 
 	'startType' => {