projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 0.9->0.10
[prosody.git]
/
core
/
configmanager.lua
diff --git
a/core/configmanager.lua
b/core/configmanager.lua
index 71f60c81952f32260b483ece8951255ee4c47123..d92120d03493e95175a6c06209c636613779bcf0 100644
(file)
--- 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;
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
is_relative = true;
end
if is_relative then