summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLuiz Otavio O Souza <luiz@netgate.com>2016-11-06 20:57:48 -0600
committerLuiz Otavio O Souza <luiz@netgate.com>2016-11-06 20:57:48 -0600
commit068ec0b175a1f85fc9a12b084f61047830b75878 (patch)
tree3494151d70704d02acaec9017b75398412f197b8 /src
parent81cc31e12563861003b7db11c84b0df2b7f41cac (diff)
parent013110a19b90698cd521fc120b06b7cc37b531e5 (diff)
downloadpfsense-068ec0b175a1f85fc9a12b084f61047830b75878.zip
pfsense-068ec0b175a1f85fc9a12b084f61047830b75878.tar.gz
Merge pull request #3176 from stilez/patch-49
* 'patch-49' of https://github.com/stilez/pfsense: 80 character lines ftw :) standardise old code ("or" -> "||")
Diffstat (limited to 'src')
-rw-r--r--src/etc/inc/config.console.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/etc/inc/config.console.inc b/src/etc/inc/config.console.inc
index 0fee7fc..90be4aa 100644
--- a/src/etc/inc/config.console.inc
+++ b/src/etc/inc/config.console.inc
@@ -454,7 +454,7 @@ function vlan_setup() {
$vlan['if'] = chop(fgets($fp));
if ($vlan['if']) {
- if (!array_key_exists($vlan['if'], $iflist) or
+ if (!array_key_exists($vlan['if'], $iflist) ||
!is_jumbo_capable($vlan['if'])) {
printf(gettext("%sInvalid interface name '%s'%s"), "\n", $vlan['if'], "\n");
continue;
OpenPOWER on IntegriCloud