diff options
author | Kim Alvefur <zash@zash.se> | 2016-05-30 13:17:28 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-05-30 13:17:28 +0200 |
commit | 6dbbb8fe6efc5a482d693860e5b716b3560f3739 (patch) | |
tree | 8725903a32a44843a489748ade1914fefe5681fb /util/dataforms.lua | |
parent | 0963de2358412e9c7591a1aa7f2ba5ac5aa3df76 (diff) | |
parent | 45079c02ef1f4edfca446c08a916c61fbf7af9df (diff) | |
download | prosody-6dbbb8fe6efc5a482d693860e5b716b3560f3739.tar.gz prosody-6dbbb8fe6efc5a482d693860e5b716b3560f3739.zip |
Merge 0.10->trunk
Diffstat (limited to 'util/dataforms.lua')
-rw-r--r-- | util/dataforms.lua | 2 |
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 |