From 11f10d8b3129cca859b156148e41ca8dcbe13041 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sat, 12 Sep 2015 17:49:47 +0200 Subject: util.dataforms: Fix interaction of required fields and empty string values (fixes #521) --- util/dataforms.lua | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'util/dataforms.lua') diff --git a/util/dataforms.lua b/util/dataforms.lua index 30b5344a..05846ab3 100644 --- a/util/dataforms.lua +++ b/util/dataforms.lua @@ -147,11 +147,12 @@ end local function simple_text(field_tag, required) local data = field_tag:get_child_text("value"); - if data and #data > 0 then - return data - elseif required then + -- XEP-0004 does not say if an empty string is acceptable for a required value + -- so we will follow HTML5 which says that empty string means missing + if required and (data == nil or data == "") then return nil, "Required value missing"; end + return data; -- Return whatever get_child_text returned, even if empty string end field_readers["text-single"] = simple_text; -- cgit v1.2.3