Merge with trunk

[prosody.git] / net / server.lua

diff --git a/net/server.lua b/net/server.lua
index 507bd81e45beb5672bab72912b3fa7edd6322547..15bba603f3a90fcc04884df913d5235fdf45c79c 100644 (file)
--- a/net/server.lua
+++ b/net/server.lua
@@ -9,7 +9,7 @@ if have_luaevent and use_luaevent == true then
        
        -- Backwards compatibility for timers, addtimer
        -- called a function roughly every second
-       local add_task = require "util.timer";
+       local add_task = require "util.timer".add_task;
        function server.addtimer(f)
                return add_task(1, function (...) f(...); return 1; end);
        end