summaryrefslogtreecommitdiffhomepage
path: root/applications
diff options
context:
space:
mode:
authorDirk Brenken <dev@brenken.org>2020-01-18 07:34:02 +0100
committerGitHub <noreply@github.com>2020-01-18 07:34:02 +0100
commitde6415af24f5759c79e621a39bd1543ca84d0030 (patch)
tree6ccb81316b7aa7c8d17252fc1755c3067cb3c527 /applications
parent84e4bdb6095526c1afef40cd9ad9cb0a5d0b6f7e (diff)
parent9ca877e08e6d23f76751fff8c458e1985bebb1f7 (diff)
Merge pull request #3527 from dibdot/master
luci-app-travelmate: bugfix add/edit WPA3 uplinks
Diffstat (limited to 'applications')
-rw-r--r--applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua2
-rw-r--r--applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua2
2 files changed, 2 insertions, 2 deletions
diff --git a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua
index c93fdd256..03c4f5bda 100644
--- a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua
+++ b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua
@@ -199,7 +199,7 @@ function wssid.write(self, section, value)
elseif encr:formvalue(section) ~= "owe" then
uci:set("wireless", newsection, "key", wkey:formvalue(section) or "")
end
- if ciph and ciph:formvalue(section) ~= "auto" then
+ if ciph and ciph:formvalue(section) and ciph:formvalue(section) ~= "auto" then
uci:set("wireless", newsection, "encryption", encr:formvalue(section) .. "+" .. ciph:formvalue(section))
else
uci:set("wireless", newsection, "encryption", encr:formvalue(section))
diff --git a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua
index 6c0a3e186..066dccacf 100644
--- a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua
+++ b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua
@@ -182,7 +182,7 @@ function wssid.write(self, section, value)
elseif encr:formvalue(section) ~= "owe" then
uci:set("wireless", m.hidden.cfg, "key", wkey:formvalue(section) or "")
end
- if ciph and ciph:formvalue(section) ~= "auto" then
+ if ciph and ciph:formvalue(section) and ciph:formvalue(section) ~= "auto" then
uci:set("wireless", m.hidden.cfg, "encryption", encr:formvalue(section) .. "+" .. ciph:formvalue(section))
else
uci:set("wireless", m.hidden.cfg, "encryption", encr:formvalue(section))