aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-06-12 17:31:55 +0100
committerMatthew Wild <mwild1@gmail.com>2012-06-12 17:31:55 +0100
commit94d42dfe8737ff3b5fe28e56f5b9d7cf0c0a0330 (patch)
tree5821c632e94a3d6d3d1b8e8c5dd0053f635b8813
parentd786589002d3626b31dcf95f929854db29d0b433 (diff)
parent49d3586dc142ca99b3f8b95584b8375fd7b5ab7c (diff)
downloadprosody-94d42dfe8737ff3b5fe28e56f5b9d7cf0c0a0330.tar.gz
prosody-94d42dfe8737ff3b5fe28e56f5b9d7cf0c0a0330.zip
Merge 0.9->trunk
-rw-r--r--util/dataforms.lua10
1 files changed, 5 insertions, 5 deletions
diff --git a/util/dataforms.lua b/util/dataforms.lua
index 8cb39144..55bad998 100644
--- a/util/dataforms.lua
+++ b/util/dataforms.lua
@@ -185,7 +185,7 @@ field_readers["list-multi"] =
function (field_tag, required)
local result = {};
for value in field_tag:childtags("value") do
- result[#result+1] = value;
+ result[#result+1] = value:get_text();
end
return result, (required and #result == 0 and "Required value missing" or nil);
end
@@ -202,10 +202,10 @@ field_readers["text-multi"] =
field_readers["list-single"] =
field_readers["text-single"];
- local boolean_values = {
- ["1"] = true, ["true"] = true,
- ["0"] = false, ["false"] = false,
- };
+local boolean_values = {
+ ["1"] = true, ["true"] = true,
+ ["0"] = false, ["false"] = false,
+};
field_readers["boolean"] =
function (field_tag, required)