Diff

plugins/mod_admin_adhoc.lua @ 4684:dc70c4ffb66d

Merge timber->trunk - thanks everyone!
author Matthew Wild <mwild1@gmail.com>
date Tue, 24 Apr 2012 21:59:20 +0100
parent 4595:bd6dc94d60e9
child 4780:4b8f2b91826c
line wrap: on
line diff
--- a/plugins/mod_admin_adhoc.lua	Tue Apr 24 03:23:44 2012 +0100
+++ b/plugins/mod_admin_adhoc.lua	Tue Apr 24 21:59:20 2012 +0100
@@ -10,7 +10,8 @@
 local hosts = prosody.hosts;
 local t_concat = table.concat;
 
-require "util.iterators";
+local iterators = require "util.iterators";
+local keys, values = iterators.keys, iterators.values;
 local usermanager_user_exists = require "core.usermanager".user_exists;
 local usermanager_create_user = require "core.usermanager".create_user;
 local usermanager_get_password = require "core.usermanager".get_password;
@@ -23,6 +24,7 @@
 local array = require "util.array";
 local modulemanager = require "modulemanager";
 
+module:depends"adhoc";
 local adhoc_new = module:require "adhoc".new;
 
 function add_user_command_handler(self, data, state)