diff options
| author | Matthew Wild <mwild1@gmail.com> | 2013-09-03 00:20:28 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2013-09-03 00:20:28 +0100 |
| commit | c6bf0953e395f36b133e0c2e8cc2ef25e943df7f (patch) | |
| tree | 830cfa780955b317d2dcfed69ec03eef9580d00b /core | |
| parent | 2fa9d5e3837fd16af5de15761a10319008814301 (diff) | |
| parent | beb2881c21aa0111cb9c57bf38f162af8222045b (diff) | |
| download | prosody-c6bf0953e395f36b133e0c2e8cc2ef25e943df7f.tar.gz prosody-c6bf0953e395f36b133e0c2e8cc2ef25e943df7f.zip | |
Merge 0.9->trunk
Diffstat (limited to 'core')
| -rw-r--r-- | core/configmanager.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/configmanager.lua b/core/configmanager.lua index 71f60c81..d92120d0 100644 --- a/core/configmanager.lua +++ b/core/configmanager.lua @@ -77,7 +77,7 @@ do 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) ~= ":\\" or path:sub(2,3) ~= ":/")) then + elseif path_sep == "\\" and (path:sub(1,1) ~= "/" and (path:sub(2,3) ~= ":\\" and path:sub(2,3) ~= ":/")) then is_relative = true; end if is_relative then |