Merge 0.6.2/waqas with 0.6.2/MattJ

[prosody.git] / plugins / mod_disco.lua

diff --git a/plugins/mod_disco.lua b/plugins/mod_disco.lua
index 8654e46b91c036d5ca2e4d24cbf2c3c22794b093..06b29f0e4a203dafb3b18d50393c57b6e6ba4f93 100644 (file)
--- a/plugins/mod_disco.lua
+++ b/plugins/mod_disco.lua
@@ -6,14 +6,13 @@
 -- COPYING file in the source package for more information.
 --
 
-local discomanager_handle = require "core.discomanager".handle;
 local componentmanager_get_children = require "core.componentmanager".get_children;
+local st = require "util.stanza"
 
+module:add_identity("server", "im", "Prosody"); -- FIXME should be in the non-existing mod_router
 module:add_feature("http://jabber.org/protocol/disco#info");
 module:add_feature("http://jabber.org/protocol/disco#items");
 
-module:add_identity("server", "im", "Prosody");
-local st = require "util.stanza"
 module:hook("iq/host/http://jabber.org/protocol/disco#info:query", function(event)
        local origin, stanza = event.origin, event.stanza;
        if stanza.attr.type ~= "get" then return; end