diff options
| author | Ermal Luçi <eri@pfsense.org> | 2009-07-03 12:47:59 +0000 |
|---|---|---|
| committer | Ermal Luçi <eri@pfsense.org> | 2009-07-03 12:47:59 +0000 |
| commit | 0b5d5aa094ec83719dda942cf9b6a589de29f888 (patch) | |
| tree | b813e77d949cd2b6357ed64caa2ef4d6741a194d /etc | |
| parent | d1e1c09cfd4413bcf65ce87c3c4d5d8d437a6e9c (diff) | |
| download | pfsense-0b5d5aa094ec83719dda942cf9b6a589de29f888.zip pfsense-0b5d5aa094ec83719dda942cf9b6a589de29f888.tar.gz | |
Check for an array before doing anything else. The array handling has changed in PHP5.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/config.inc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/etc/inc/config.inc b/etc/inc/config.inc index 749f924..79a9f0e 100644 --- a/etc/inc/config.inc +++ b/etc/inc/config.inc @@ -1000,7 +1000,8 @@ EODD; unset($config['nat']); } if (preg_match($g['wireless_regex'], $lanif)) { - if (!is_array($config['interfaces']['lan']['wireless'])) + if (is_array($config['interfaces']['lan']) && + (!is_array($config['interfaces']['lan']['wireless']))) $config['interfaces']['lan']['wireless'] = array(); } else { unset($config['interfaces']['lan']['wireless']); @@ -1008,7 +1009,8 @@ EODD; $config['interfaces']['wan']['if'] = $wanif; if (preg_match($g['wireless_regex'], $wanif)) { - if (!is_array($config['interfaces']['wan']['wireless'])) + if (is_array($config['interfaces']['lan']) && + (!is_array($config['interfaces']['wan']['wireless']))) $config['interfaces']['wan']['wireless'] = array(); } else { unset($config['interfaces']['wan']['wireless']); |
