summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStephen Beaver <sbeaver@netgate.com>2015-09-30 14:50:39 -0400
committerStephen Beaver <sbeaver@netgate.com>2015-09-30 14:50:39 -0400
commitd1f641a069b420472c0f40a4c4a4901f41e1d2a3 (patch)
tree09e942dfc2027f34873bb8879be0f4baba0509bf /src
parent9511d1a2ccdbf006df6fdc20c2ba85392665c3f6 (diff)
downloadpfsense-d1f641a069b420472c0f40a4c4a4901f41e1d2a3.zip
pfsense-d1f641a069b420472c0f40a4c4a4901f41e1d2a3.tar.gz
Removed bogus array_merge()
Diffstat (limited to 'src')
-rw-r--r--src/usr/local/www/diag_testport.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/usr/local/www/diag_testport.php b/src/usr/local/www/diag_testport.php
index 4fe9c4f..0faa3e2 100644
--- a/src/usr/local/www/diag_testport.php
+++ b/src/usr/local/www/diag_testport.php
@@ -284,7 +284,7 @@ $section->addInput(new Form_Select(
'sourceip',
'Source Address',
$sourceip,
- array_merge(array('' => 'Any'), get_possible_traffic_source_addresses(true))
+ ['' => 'Any'] + get_possible_traffic_source_addresses(true)
))->setHelp('Select source address for the trace');
$section->addInput(new Form_Select(
OpenPOWER on IntegriCloud