Backed out changeset 52b6901cabb0 (to be replaced)

1 files changed, 2 insertions, 9 deletions

diff --git a/plugins/adhoc/adhoc.lib.lua b/plugins/adhoc/adhoc.lib.lua
index 57059b3f..0cb4efe1 100644
--- a/plugins/adhoc/adhoc.lib.lua
+++ b/plugins/adhoc/adhoc.lib.lua
@@ -25,7 +25,6 @@ function _M.new(name, node, handler, permission)
 end
 
 function _M.handle_cmd(command, origin, stanza)
-	local cmdtag, actions;
 	local sessionid = stanza.tags[1].attr.sessionid or uuid.generate();
 	local dataIn = {};
 	dataIn.to = stanza.attr.to;
@@ -59,7 +58,7 @@ function _M.handle_cmd(command, origin, stanza)
 		elseif name == "error" then
 			cmdtag:tag("note", {type="error"}):text(content.message):up();
 		elseif name =="actions" then
-			actions = st.stanza("actions");
+			local actions = st.stanza("actions");
 			for _, action in ipairs(content) do
 				if (action == "prev") or (action == "next") or (action == "complete") then
 					actions:tag(action):up();
@@ -68,6 +67,7 @@ function _M.handle_cmd(command, origin, stanza)
 						'" at node "'..command.node..'" provided an invalid action "'..action..'"');
 				end
 			end
+			cmdtag:add_child(actions);
 		elseif name == "form" then
 			cmdtag:add_child((content.layout or content):form(content.values));
 		elseif name == "result" then
@@ -76,13 +76,6 @@ function _M.handle_cmd(command, origin, stanza)
 			cmdtag:add_child(content);
 		end
 	end
-
-	if not actions then
-		actions = st.stanza("actions");
-		actions:tag("complete"):up();
-	end
-	cmdtag:add_child(actions);
-
 	stanza:add_child(cmdtag);
 	origin.send(stanza);