diff options
| author | Matthew Wild <mwild1@gmail.com> | 2012-09-13 18:32:24 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2012-09-13 18:32:24 +0100 |
| commit | 43bafec7c398173680268f97238736c04aeb8bba (patch) | |
| tree | 7c6a0a8551771a89ec2fcc3f58857f0b0a26db1a | |
| parent | d05b3ab008de4b2a4f3f756d2a68eda95da074a3 (diff) | |
| parent | 6063b9a08ed5a43d090513ad283acb404aa51522 (diff) | |
| download | prosody-43bafec7c398173680268f97238736c04aeb8bba.tar.gz prosody-43bafec7c398173680268f97238736c04aeb8bba.zip | |
Merge 0.9->trunk
| -rw-r--r-- | core/configmanager.lua | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/core/configmanager.lua b/core/configmanager.lua index 8fea3be5..51b9f5fe 100644 --- a/core/configmanager.lua +++ b/core/configmanager.lua @@ -247,11 +247,10 @@ do end end else + local file = resolve_relative_path(config_file:gsub("[^"..path_sep.."]+$", ""), file); local f, err = io.open(file); if f then - local data = f:read("*a"); - local file = resolve_relative_path(config_file:gsub("[^"..path_sep.."]+$", ""), file); - local ret, err = parsers.lua.load(data, file, config); + local ret, err = parsers.lua.load(f:read("*a"), file, config); if not ret then error(err:gsub("%[string.-%]", file), 0); end end if not f then error("Error loading included "..file..": "..err, 0); end |