aboutsummaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-05-30 13:17:28 +0200
committerKim Alvefur <zash@zash.se>2016-05-30 13:17:28 +0200
commitfcca840db8d7c39253869f27fbca736da6c43909 (patch)
tree8725903a32a44843a489748ade1914fefe5681fb /util
parente8e531fa1d45b4b454abdac3a170cba16da02b86 (diff)
parent6b2c577b2097728507d23a6d2b2fa9207a22df9d (diff)
downloadprosody-fcca840db8d7c39253869f27fbca736da6c43909.tar.gz
prosody-fcca840db8d7c39253869f27fbca736da6c43909.zip
Merge 0.10->trunk
Diffstat (limited to 'util')
-rw-r--r--util/dataforms.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/util/dataforms.lua b/util/dataforms.lua
index 685f3aaf..756f35a7 100644
--- a/util/dataforms.lua
+++ b/util/dataforms.lua
@@ -72,7 +72,7 @@ function form_t.form(layout, data, formtype)
for _, val in ipairs(field.options or value) do
if type(val) == "table" then
form:tag("option", { label = val.label }):tag("value"):text(val.value):up():up();
- if value == val.value or field.options and val.default and (not has_default) then
+ if value == val.value or val.default and (not has_default) then
form:tag("value"):text(val.value):up();
has_default = true;
end