Merge 0.10->trunk

[prosody.git] / util / caps.lua

diff --git a/util/caps.lua b/util/caps.lua
index 4723b912942e6606ccf59679e087c87c09b7597c..cd5ff9c0efdddfb6dd8fbb663a67e4464ec5acdd 100644 (file)
--- a/util/caps.lua
+++ b/util/caps.lua
@@ -12,9 +12,9 @@ local sha1 = require "util.hashes".sha1;
 local t_insert, t_sort, t_concat = table.insert, table.sort, table.concat;
 local ipairs = ipairs;
 
-module "caps"
+local _ENV = nil;
 
-function calculate_hash(disco_info)
+local function calculate_hash(disco_info)
        local identities, features, extensions = {}, {}, {};
        for _, tag in ipairs(disco_info) do
                if tag.name == "identity" then
@@ -58,4 +58,6 @@ function calculate_hash(disco_info)
        return ver, S;
 end
 
-return _M;
+return {
+       calculate_hash = calculate_hash;
+};