summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWarren Baker <warren@decoy.co.za>2010-10-22 17:49:20 +0200
committerWarren Baker <warren@decoy.co.za>2010-10-22 17:49:20 +0200
commit90e64fad79395814e81be2b84871503f211eea00 (patch)
tree4566afec3d077a74d2d6004d6c0bb2c3c97de5d0
parent1feb93cf7481f728bb2f2fc1b90eb2bd10a71f30 (diff)
downloadpfsense-90e64fad79395814e81be2b84871503f211eea00.zip
pfsense-90e64fad79395814e81be2b84871503f211eea00.tar.gz
Check to see if it is not an array first - as per jim-p on IRC.
-rw-r--r--etc/inc/upgrade_config.inc3
1 files changed, 2 insertions, 1 deletions
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc
index 124ba41..5c8bd08 100644
--- a/etc/inc/upgrade_config.inc
+++ b/etc/inc/upgrade_config.inc
@@ -1322,7 +1322,8 @@ function upgrade_051_to_052() {
$crl['descr'] = "Imported OpenVPN CRL #{$index}";
$crl['caref'] = $ca['refid'];
$crl['text'] = $server['crl'];
- $config['crl'] = array();
+ if(!is_array($config['crl']))
+ $config['crl'] = array();
$config['crl'][] = $crl;
$server['crlref'] = $crl['refid'];
}
OpenPOWER on IntegriCloud