Merge with 0.6

diff --git a/util/dataforms.lua b/util/dataforms.lua
index 5626172e15fc614e62ab99d568b32c4e684b8a9b..a3bde8caab1c8879965efef52a9b42a715b03a2c 100644 (file)
--- a/util/dataforms.lua
+++ b/util/dataforms.lua
@@ -93,7 +93,13 @@ function form_t.data(layout, stanza)
        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