diff -r d3498f115fcd -r 1ae653712e37 mod_adhoc/adhoc/adhoc.lib.lua
--- a/mod_adhoc/adhoc/adhoc.lib.lua	Fri Jul 09 22:38:05 2010 +0200
+++ b/mod_adhoc/adhoc/adhoc.lib.lua	Sat Jul 10 01:26:41 2010 +0200
@@ -69,9 +69,9 @@
 			end
 			cmdtag:add_child(actions);
 		elseif name == "form" then
-			cmdtag:add_child(content:form());
+			cmdtag:add_child((content.layout or content):form(content.data));
 		elseif name == "result" then
-			cmdtag:add_child(content.layout:form(content.data, "result"));
+			cmdtag:add_child((content.layout or content):form(content.data, "result"));
 		elseif name == "other" then
 			cmdtag:add_child(content);
 		end