From 478d71ffdb0ac73f72e6f91cb20691d13ac4e261 Mon Sep 17 00:00:00 2001 From: JT Smith Date: Wed, 22 Jun 2005 19:29:45 +0000 Subject: [PATCH] upgrade bug fixes --- docs/upgrades/upgrade_6.2.11-6.3.0.pl | 1 + docs/upgrades/upgrade_6.5.6-6.6.0.pl | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/upgrades/upgrade_6.2.11-6.3.0.pl b/docs/upgrades/upgrade_6.2.11-6.3.0.pl index 82ac0315c..f9fab4ebd 100644 --- a/docs/upgrades/upgrade_6.2.11-6.3.0.pl +++ b/docs/upgrades/upgrade_6.2.11-6.3.0.pl @@ -500,6 +500,7 @@ my $lastCollateralFolderId = 'nolastid'; my ($parentId, $baseLineage); my $sth = WebGUI::SQL->read("select * from collateral order by collateralFolderId"); while (my $data = $sth->hashRef) { + next if ($data->{filename} eq ""); print "\t\tConverting collateral item ".$data->{collateralId}." for folder ".$data->{collateralFolderId}."\n" unless ($quiet); unless ($lastCollateralFolderId eq $data->{collateralFolderId}) { my $id = $data->{collateralFolderId}; diff --git a/docs/upgrades/upgrade_6.5.6-6.6.0.pl b/docs/upgrades/upgrade_6.5.6-6.6.0.pl index 84436ed56..feb44f212 100644 --- a/docs/upgrades/upgrade_6.5.6-6.6.0.pl +++ b/docs/upgrades/upgrade_6.5.6-6.6.0.pl @@ -48,7 +48,7 @@ $conf->write; #-------------------------------------------- print "\tAdding default product template\n" unless ($quiet); -my $import = WebGUI::Asset->newByUrl('templates'); +my $import = WebGUI::Asset->getImportNode; my $folder = $import->addChild({ title=>"Commerce/Product", menuTitle=>"Commerce/Product",