# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1259179138 0
# Node ID 98a880fda81358c2b604f1b797da03fc12eb5f33
# Parent  4678aa4567c8f87da1687196cfc6c8713c073f01# Parent  9e1c6b6a2ee4109648cae3a2829620e674cf74e7
Merge with 0.6

diff -r 4678aa4567c8 -r 98a880fda813 util/dataforms.lua
--- a/util/dataforms.lua	Wed Nov 25 19:46:22 2009 +0100
+++ b/util/dataforms.lua	Wed Nov 25 19:58:58 2009 +0000
@@ -93,7 +93,13 @@
 	local data = {};
 	
 	for field_tag in stanza:childtags() do
-		local field_type = field_tag.attr.type;
+		local field_type;
+		for n, field in ipairs(layout) do
+			if field.name == field_tag.attr.var then
+				field_type = field.type;
+				break;
+			end
+		end
 		
 		local reader = field_readers[field_type];
 		if reader then