From 4aba2605458defda1b89cd4776e5465a378702c8 Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Sun, 7 Mar 2004 23:01:33 +0000
Subject: [PATCH] fixing bugs

---
 docs/upgrades/upgrade_5.9.9-6.0.0.pl | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/docs/upgrades/upgrade_5.9.9-6.0.0.pl b/docs/upgrades/upgrade_5.9.9-6.0.0.pl
index 64e4b4c57..267701e3e 100644
--- a/docs/upgrades/upgrade_5.9.9-6.0.0.pl
+++ b/docs/upgrades/upgrade_5.9.9-6.0.0.pl
@@ -234,8 +234,7 @@ WebGUI::SQL->write("alter table SQLReport drop column username");
 WebGUI::SQL->write("alter table SQLReport drop column identifier");
 use WebGUI::DatabaseLink;
 my $templateId;
-use WebGUI::Macro;
-my $a = WebGUI::SQL->read("select a.databaseLinkId, a.dbQuery, a.template, a.wobjectId, b.title, a.preprocessMacros
+my $a = WebGUI::SQL->read("select a.databaseLinkId, a.dbQuery, a.template, a.wobjectId, b.title
 	from SQLReport a , wobject b where a.wobjectId=b.wobjectId");
 while (my $data = $a->hashRef) {
 	next if ($data->{dbQuery} eq "");
@@ -247,7 +246,6 @@ while (my $data = $a->hashRef) {
 		} else {
 			$templateId = 1000;
 		}
-		$data->{dbQuery} = WebGUI::Macro::process($data->{dbQuery}) if ($data->{preprocessMacros});
 		my $b = WebGUI::SQL->unconditionalRead($data->{dbQuery},$db->dbh);
 		my @template = split(/\^\-\;/,$data->{template});
 		my $final = '<tmpl_if displayTitle>
@@ -569,6 +567,7 @@ while (my $authHash = $authSth->hashRef){
 
 #--------------------------------------------
 print "\tRemoving unneeded files and directories.\n" unless ($quiet);
+# can't delete macros and wobjects in this version or upgrade will fail. must delete in future release
 #unlink("../../lib/WebGUI/Wobject/Item.pm");
 #unlink("../../lib/WebGUI/Wobject/LinkList.pm");
 #unlink("../../lib/WebGUI/Wobject/FAQ.pm");