From 7792b9d9bcd91c9cdb96397a2163568001d02540 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Fri, 13 Mar 2009 20:48:43 +0000
Subject: [PATCH] Forward porting gateway driver upgrade fix, handling
 undefined drivers.

---
 docs/changelog/7.x.x.txt             | 1 +
 docs/upgrades/upgrade_7.6.8-7.6.9.pl | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 2d6379bd1..155543c4a 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -12,6 +12,7 @@
  - 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)
+ - fixed #9943: Upgrade script fails with Payment Gateways
 
 7.6.14
  - fixed: IE6 shows Admin Bar over Asset Manager
diff --git a/docs/upgrades/upgrade_7.6.8-7.6.9.pl b/docs/upgrades/upgrade_7.6.8-7.6.9.pl
index a1ea626a1..1a685ef58 100644
--- a/docs/upgrades/upgrade_7.6.8-7.6.9.pl
+++ b/docs/upgrades/upgrade_7.6.8-7.6.9.pl
@@ -54,7 +54,8 @@ sub fixPayDriverLabels {
     print "\tGet rid of the duplicate label properties in the PayDrivers... " unless $quiet;
     my $pay = WebGUI::Shop::Pay->new($session);
     my $gateways = $pay->getPaymentGateways;
-    foreach my $gateway (@{ $gateways }) {
+    GATEWAY: foreach my $gateway (@{ $gateways }) {
+        next GATEWAY unless $gateway;
         my $gatewayId = $gateway->getId;
         my $jsonLabel = $gateway->get('label');
         next if $jsonLabel;