aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-09-03 00:20:28 +0100
committerMatthew Wild <mwild1@gmail.com>2013-09-03 00:20:28 +0100
commit8eb7b73968209de2031d534abad17045f956a35e (patch)
tree830cfa780955b317d2dcfed69ec03eef9580d00b /core
parentacf2cd9d36489efca06af796f2ba0d084f4dfe1b (diff)
parentcb7584022716f4407b4460754645e6af587e4730 (diff)
downloadprosody-8eb7b73968209de2031d534abad17045f956a35e.tar.gz
prosody-8eb7b73968209de2031d534abad17045f956a35e.zip
Merge 0.9->trunk
Diffstat (limited to 'core')
-rw-r--r--core/configmanager.lua2
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