prosody
3942630b4e35
core/moduleapi.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Diff

core/moduleapi.lua @ 6168:3942630b4e35

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 09 May 2014 23:35:54 +0200
parent 5900:cb1103423aa7
parent 6165:6a184b16b717
child 6418:ae798314347c
line wrap: on
line diff
--- a/core/moduleapi.lua	Tue May 06 00:37:08 2014 +0200
+++ b/core/moduleapi.lua	Fri May 09 23:35:54 2014 +0200
@@ -13,6 +13,7 @@
 local logger = require "util.logger";
 local pluginloader = require "util.pluginloader";
 local timer = require "util.timer";
+local resolve_relative_path = require"util.paths".resolve_relative_path;
 
 local t_insert, t_remove, t_concat = table.insert, table.remove, table.concat;
 local error, setmetatable, type = error, setmetatable, type;
@@ -380,7 +381,7 @@
 end
 
 function api:load_resource(path, mode)
-	path = config.resolve_relative_path(self:get_directory(), path);
+	path = resolve_relative_path(self:get_directory(), path);
 	return io.open(path, mode);
 end