util.dataforms: Don't return invalid JIDs in jid-single.

[prosody.git] / util / dataforms.lua

diff --git a/util/dataforms.lua b/util/dataforms.lua
index 85bb39c146f959d4b6ff81fca46a27c597c97dd3..8cb3914418bf1d1cbe720ea0edb0ff6ee57f4da1 100644 (file)
--- a/util/dataforms.lua
+++ b/util/dataforms.lua
@@ -156,7 +156,7 @@ field_readers["jid-single"] =
                if data and #data > 0 then
                        return data
                elseif raw_data then
-                       return raw_data, "Invalid JID";
+                       return nil, "Invalid JID: " .. raw_data;
                elseif required then
                        return nil, "Required value missing";
                end
@@ -214,7 +214,7 @@ field_readers["boolean"] =
                if value ~= nil then
                        return value;
                elseif raw_value then
-                       return "Invalid boolean representation";
+                       return nil, "Invalid boolean representation";
                elseif required then
                        return nil, "Required value missing";
                end