Changeset

4929:15c1b8aa123d

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Tue, 12 Jun 2012 17:31:55 +0100
parents 4927:13d18cc6527d (current diff) 4928:5211c11dd865 (diff)
children 4930:42ac50c0382e 4941:d46948d3018a
files
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/util/dataforms.lua	Tue Jun 12 13:55:56 2012 +0100
+++ b/util/dataforms.lua	Tue Jun 12 17:31:55 2012 +0100
@@ -185,7 +185,7 @@
 	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["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)