# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1442072987 -7200
# Node ID e08f5d081a6c9fb20a937641f63ab651ab9b78a8
# Parent  22522443982f1f769e79269cb2e7d296b02838f7
util.dataforms: Fix interaction of required fields and empty string values (fixes #521)

diff -r 22522443982f -r e08f5d081a6c util/dataforms.lua
--- a/util/dataforms.lua	Sat Sep 12 17:40:14 2015 +0200
+++ b/util/dataforms.lua	Sat Sep 12 17:49:47 2015 +0200
@@ -147,11 +147,12 @@
 
 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;