From 19368e5309de6ac36ffe74fe3abdab5834a0a75f Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Fri, 13 Mar 2009 20:30:08 +0000 Subject: [PATCH] Forward port paydriver upgrade bug fix. Undef was not handled. --- docs/changelog/7.x.x.txt | 7 +++---- docs/upgrades/upgrade_7.6.7-7.6.8.pl | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 1e73dd502..2d6379bd1 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -8,11 +8,10 @@ - fixed #9892: Typo in "Default Gallery View Album" Template [TEMPLATE] - fixed #9826: Inbox messages sent by email don't include from username - rfe: added Asset History browser (perlDreamer Consulting, LLC and Plain Black) - - fixed: Commit w/ approval workflow can crash under race conditions - resulting in permanently locked content (Martin Kamerbeek / Oqapi ) - - fixed: Each textarea inserts identical JS that should be inserted only once - ( Martin Kamerbeek / Oqapi ) + - fixed: Commit w/ approval workflow can crash under race conditions resulting in permanently locked content (Martin Kamerbeek / Oqapi ) + - fixed: Each textarea inserts identical JS that should be inserted only once ( Martin Kamerbeek / Oqapi ) - added: Vendor payout system ( Martin Kamerbeek / Oqapi ) + - fixed #9942: Upgrade script fails with ITransact driver (William McKee, Knowmad Technologies) 7.6.14 - fixed: IE6 shows Admin Bar over Asset Manager diff --git a/docs/upgrades/upgrade_7.6.7-7.6.8.pl b/docs/upgrades/upgrade_7.6.7-7.6.8.pl index 09cd0d555..4d0bc27b4 100644 --- a/docs/upgrades/upgrade_7.6.7-7.6.8.pl +++ b/docs/upgrades/upgrade_7.6.7-7.6.8.pl @@ -51,7 +51,7 @@ sub setDefaultItransactCredentialTemplate { my $drivers = $pay->getPaymentGateways($session); DRIVER: foreach my $driver (@{ $drivers }) { ##Only work on ITransact drivers - next DRIVER unless $driver->className eq "WebGUI::Shop::PayDriver::ITransact"; + next DRIVER unless $driver && $driver->className eq "WebGUI::Shop::PayDriver::ITransact"; my $properties = $driver->get(); ##And only ones that don't already have a template set next DRIVER if $properties->{credentialsTemplateId};