From e1b583a935fa8ff730ee582f748608a2d82ae5bb Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Thu, 16 Nov 2006 00:14:14 +0000
Subject: [PATCH] some upgrade script fixes

---
 docs/changelog/7.x.x.txt             | 2 ++
 docs/upgrades/upgrade_7.1.3-7.2.0.pl | 1 +
 lib/WebGUI/AdSpace.pm                | 1 +
 3 files changed, 4 insertions(+)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 5ad86b0e4..76cb9d277 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -15,6 +15,8 @@
  - fix: Bug in "Article with Files"
  - fix: SQLReport pagination retains op= parameter
  - fix: Invalid MIME type set for images
+ - Fixed a problem with the adspace upgrade in 7.2.0
+ - Fixed a problem with the survey upgrade in 7.2.0 
 
 
 7.2.0
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 3dab7354b..5cf1c395b 100644
--- a/docs/upgrades/upgrade_7.1.3-7.2.0.pl
+++ b/docs/upgrades/upgrade_7.1.3-7.2.0.pl
@@ -249,6 +249,7 @@ sub reorderSurveyCollateral {
 	$sth1->execute();
 	while (my ($assetId) = $sth1->array) {  ##Iterate over all surveys
 		my $survey = WebGUI::Asset->new($session, $assetId, 'WebGUI::Asset::Wobject::Survey');
+		next unless defined $survey; # skip pending surveys
 		my $Survey_Id = $survey->get('Survey_id');
 		$sth2->execute([$Survey_Id]);
 		while (my ($questionId) = $sth2->array) { ##iterate over all questions in the survey
diff --git a/lib/WebGUI/AdSpace.pm b/lib/WebGUI/AdSpace.pm
index ad8869daa..8a060deba 100644
--- a/lib/WebGUI/AdSpace.pm
+++ b/lib/WebGUI/AdSpace.pm
@@ -15,6 +15,7 @@ package WebGUI::AdSpace;
 =cut
 
 use strict;
+use WebGUI::AdSpace::Ad;
 
 =head1 NAME