From 9511d1a2ccdbf006df6fdc20c2ba85392665c3f6 Mon Sep 17 00:00:00 2001 From: Stephen Beaver Date: Wed, 30 Sep 2015 14:43:10 -0400 Subject: Fixed bogus array_merge in localid_type selector --- src/usr/local/www/vpn_ipsec_phase2.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/usr/local/www/vpn_ipsec_phase2.php') 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( -- cgit v1.1