summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsmos <seth.mos@dds.nl>2011-11-27 19:33:58 +0100
committersmos <seth.mos@dds.nl>2011-11-27 19:33:58 +0100
commit50fd2013dd65d702e10213ae1e0a0e57a4cc2be6 (patch)
treecb244f67b81bcf06f9bce7b2d0dfd3aff98db570
parentf328ad12e0cb2d2af4fbbdfc8b4cfbe53ab00f0c (diff)
downloadpfsense-50fd2013dd65d702e10213ae1e0a0e57a4cc2be6.zip
pfsense-50fd2013dd65d702e10213ae1e0a0e57a4cc2be6.tar.gz
Concatenate array, using array_merge() will clobber numerical gateway group entries.
-rw-r--r--etc/inc/filter.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc
index 69fb9a7..224931d 100644
--- a/etc/inc/filter.inc
+++ b/etc/inc/filter.inc
@@ -668,7 +668,7 @@ function filter_generate_gateways() {
}
/* Create a global array to avoid errors on rulesets. */
- $GatewaysList = array_merge($GatewaysList, $GatewayGroupsList);
+ $GatewaysList = $GatewaysList + $GatewayGroupsList;
$rules .= "\n";
OpenPOWER on IntegriCloud