Software / code / prosody
Changeset
4956:bc26e6d519ae
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 19 Jul 2012 15:36:31 +0100 |
| parents | 4953:24c2150cc8b0 (current diff) 4955:4f1b6a4784f9 (diff) |
| children | 4958:1f1c74ac9666 |
| files | plugins/mod_admin_adhoc.lua |
| diffstat | 2 files changed, 1 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/core/moduleapi.lua Mon Jul 09 02:36:09 2012 +0100 +++ b/core/moduleapi.lua Thu Jul 19 15:36:31 2012 +0100 @@ -14,8 +14,6 @@ local pluginloader = require "util.pluginloader"; local timer = require "util.timer"; -local multitable_new = require "util.multitable".new; - local t_insert, t_remove, t_concat = table.insert, table.remove, table.concat; local error, setmetatable, setfenv, type = error, setmetatable, setfenv, type; local ipairs, pairs, select, unpack = ipairs, pairs, select, unpack; @@ -339,4 +337,4 @@ return io.open(path, mode); end -return api; +return api; \ No newline at end of file
--- a/plugins/mod_admin_adhoc.lua Mon Jul 09 02:36:09 2012 +0100 +++ b/plugins/mod_admin_adhoc.lua Thu Jul 19 15:36:31 2012 +0100 @@ -469,7 +469,6 @@ '". Error was: "'..tostring(err or "<unspecified>")..'"' } }; end else - local modules = array.collect(keys(hosts[data.to].modules)):sort(); return { status = "executing", form = layout }, "executing"; end end
