prosody
8796aa94c4b5
util/pluginloader.lua

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

Software / code / prosody

Diff

util/pluginloader.lua @ 6031:8796aa94c4b5

Merge 0.9->0.10
author Kim Alvefur <zash@zash.se>
date Sun, 09 Mar 2014 23:47:53 +0100
parent 5776:bd0ff8ae98a8
parent 6029:dd3d4cfbd3cb
child 6777:5de6b93d0190
line wrap: on
line diff
--- a/util/pluginloader.lua	Wed Feb 26 22:21:55 2014 +0100
+++ b/util/pluginloader.lua	Sun Mar 09 23:47:53 2014 +0100
@@ -39,10 +39,10 @@
 	resource = resource or "mod_"..plugin..".lua";
 
 	local names = {
-		"mod_"..plugin.."/"..plugin.."/"..resource; -- mod_hello/hello/mod_hello.lua
-		"mod_"..plugin.."/"..resource;              -- mod_hello/mod_hello.lua
-		plugin.."/"..resource;                      -- hello/mod_hello.lua
-		resource;                                   -- mod_hello.lua
+		"mod_"..plugin..dir_sep..plugin..dir_sep..resource; -- mod_hello/hello/mod_hello.lua
+		"mod_"..plugin..dir_sep..resource;                  -- mod_hello/mod_hello.lua
+		plugin..dir_sep..resource;                          -- hello/mod_hello.lua
+		resource;                                           -- mod_hello.lua
 	};
 
 	return load_file(names);