diff options
| author | Stephen Beaver <sbeaver@netgate.com> | 2015-09-30 14:43:10 -0400 |
|---|---|---|
| committer | Stephen Beaver <sbeaver@netgate.com> | 2015-09-30 14:43:10 -0400 |
| commit | 9511d1a2ccdbf006df6fdc20c2ba85392665c3f6 (patch) | |
| tree | edcbcff5d6fceb0d95a3ba981f8e9b6df77c0fb5 /src/usr/local/www/vpn_ipsec_phase2.php | |
| parent | 9120eda6883ecb8772f6bddc758c816e2550b5db (diff) | |
| download | pfsense-9511d1a2ccdbf006df6fdc20c2ba85392665c3f6.zip pfsense-9511d1a2ccdbf006df6fdc20c2ba85392665c3f6.tar.gz | |
Fixed bogus array_merge in localid_type selector
Diffstat (limited to 'src/usr/local/www/vpn_ipsec_phase2.php')
| -rw-r--r-- | src/usr/local/www/vpn_ipsec_phase2.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/usr/local/www/vpn_ipsec_phase2.php b/src/usr/local/www/vpn_ipsec_phase2.php index fd85068..6c85685 100644 --- a/src/usr/local/www/vpn_ipsec_phase2.php +++ b/src/usr/local/www/vpn_ipsec_phase2.php @@ -525,7 +525,7 @@ $group->add(new Form_Select( 'localid_type', null, $pconfig['localid_type'], - array_merge(array('address' => 'Address', 'network' => 'Network'), $subnetarray) + ['address' => 'Address', 'network' => 'Network'] + $subnetarray ))->setHelp('Type'); $group->add(new Form_IpAddress( |
