Merge 0.7->trunk

[prosody.git] / core / configmanager.lua

diff --git a/core/configmanager.lua b/core/configmanager.lua
index b974d2f245406c46253e385a1c202ecd184bc112..e7677df67e63ff2a4a48b2362cfecf3b14fc02c6 100644 (file)
--- a/core/configmanager.lua
+++ b/core/configmanager.lua
@@ -68,7 +68,7 @@ function load(filename, format)
 
        if parsers[format] and parsers[format].load then
                local f, err = io.open(filename);
-               if f then 
+               if f then
                        local ok, err = parsers[format].load(f:read("*a"), filename);
                        f:close();
                        if ok then
@@ -95,6 +95,15 @@ function addparser(format, parser)
        end
 end
 
+-- _M needed to avoid name clash with local 'parsers'
+function _M.parsers()
+       local p = {};
+       for format in pairs(parsers) do
+               table.insert(p, format);
+       end
+       return p;
+end
+
 -- Built-in Lua parser
 do
        local loadstring, pcall, setmetatable = _G.loadstring, _G.pcall, _G.setmetatable;