From 92a2ceae1182f47d2a45ce9a98be888bd4cddf67 Mon Sep 17 00:00:00 2001
From: Seth Mos <seth.mos@xs4all.nl>
Date: Thu, 6 May 2010 11:06:21 +0200
Subject: Do not trip with configuration upgrades on a empty load balancer tag.

---
 etc/inc/upgrade_config.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'etc')

diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc
index d2b33f7..fcecc51 100644
--- a/etc/inc/upgrade_config.inc
+++ b/etc/inc/upgrade_config.inc
@@ -1602,9 +1602,10 @@ function upgrade_053_to_054() {
 	}
 	// Unset lbpool if we no longer have any server pools
 	if (count($lbpool_srv_arr) == 0) {
-		unset($config['load_balancer']['lbpool']);
 		if(count($config['load_balancer']) == 0) {
 			unset($config['load_balancer']);
+		} else {
+			unset($config['load_balancer']['lbpool']);
 		}
 	} else {
 		$config['load_balancer']['lbpool'] = $lbpool_srv_arr;
-- 
cgit v1.1