diff options
Diffstat (limited to 'prosody')
| -rwxr-xr-x | prosody | 21 |
1 files changed, 0 insertions, 21 deletions
@@ -163,23 +163,6 @@ function init_global_state() prosody.paths = { source = CFG_SOURCEDIR, config = CFG_CONFIGDIR, plugins = CFG_PLUGINDIR, data = CFG_DATADIR }; - local path_sep = package.config:sub(1,1); - local rel_path_start = ".."..path_sep; - function prosody.resolve_relative_path(parent_path, path) - if path then - local is_relative; - if path_sep == "/" and path:sub(1,1) ~= "/" then - is_relative = true; - elseif path_sep == "\\" and (path:sub(1,1) ~= "/" and path:sub(2,3) ~= ":\\") then - is_relative = true; - end - if is_relative then - return parent_path..path_sep..path; - end - end - return path; - end - prosody.arg = _G.arg; prosody.platform = "unknown"; @@ -310,10 +293,6 @@ function load_secondary_libraries() require "core.usermanager" require "core.sessionmanager" require "core.stanza_router" - package.loaded['core.componentmanager'] = setmetatable({},{__index=function() - log("warn", "componentmanager is deprecated: %s", debug.traceback():match("\n[^\n]*\n[\s\t]*([^\n]*)")); - return function() end - end}); require "net.http" |