diff options
| author | Renato Botelho <renato.botelho@bluepex.com> | 2010-12-22 13:57:05 -0200 |
|---|---|---|
| committer | Renato Botelho <renato.botelho@bluepex.com> | 2010-12-22 13:57:05 -0200 |
| commit | f6d4854b25e3fc0f8ba7053ccb616e2b33dbbe3a (patch) | |
| tree | f018115c0ce0c22a91801d119a9138b32c1e814f /etc/inc/globals.inc | |
| parent | 1e312328572b5f583fe34cf71c1efa89df460260 (diff) | |
| download | pfsense-f6d4854b25e3fc0f8ba7053ccb616e2b33dbbe3a.zip pfsense-f6d4854b25e3fc0f8ba7053ccb616e2b33dbbe3a.tar.gz | |
Typecast second param for array_merge to silent a warning that is breaking build since we check output of test_php.php looking for a string 'FCGI-PASSED PASSED'
Diffstat (limited to 'etc/inc/globals.inc')
| -rw-r--r-- | etc/inc/globals.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/inc/globals.inc b/etc/inc/globals.inc index 905f56f..8afab4a 100644 --- a/etc/inc/globals.inc +++ b/etc/inc/globals.inc @@ -110,7 +110,7 @@ $g = array( // Loop through and set vlan_long_frame VLAN_MTU $vlan_native_supp = get_nics_with_capabilities("vlanmtu"); -$g['vlan_long_frame'] = array_merge(array("vge", "bfe", "bge", "dc", "em", "fxp", "gem", "hme", "ixgb", "le", "lem", "nge", "re", "rl", "sis", "sk", "ste", "ti", "tl", "tx", "txp", "vr", "xl", "lagg"), $vlan_native_supp); +$g['vlan_long_frame'] = array_merge(array("vge", "bfe", "bge", "dc", "em", "fxp", "gem", "hme", "ixgb", "le", "lem", "nge", "re", "rl", "sis", "sk", "ste", "ti", "tl", "tx", "txp", "vr", "xl", "lagg"), (array)$vlan_native_supp); /* IP TOS flags */ $iptos = array("lowdelay", "throughput", "reliability"); @@ -164,4 +164,4 @@ $sysctls = array("net.inet.ip.portrange.first" => "1024", $config_parsed = false; -?>
\ No newline at end of file +?> |
