Software / code / prosody
Changeset
5940:783107f85ea0
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 13 Dec 2013 12:53:14 +0000 |
| parents | 5936:97b891475cd6 (current diff) 5939:56d81af64fc5 (diff) |
| children | 5942:b5e8843cfbeb 5946:04f2138dfa87 |
| files | |
| diffstat | 2 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/muc/mod_muc.lua Wed Dec 11 22:32:17 2013 +0000 +++ b/plugins/muc/mod_muc.lua Fri Dec 13 12:53:14 2013 +0000 @@ -164,7 +164,7 @@ return true; end if not(restrict_room_creation) or - (restrict_room_creation == "admin" and is_admin(stanza.attr.from)) or + is_admin(stanza.attr.from)) or (restrict_room_creation == "local" and select(2, jid_split(stanza.attr.from)) == module.host:gsub("^[^%.]+%.", "")) then room = create_room(bare); end
--- a/prosody Wed Dec 11 22:32:17 2013 +0000 +++ b/prosody Fri Dec 13 12:53:14 2013 +0000 @@ -86,6 +86,7 @@ break; end end + prosody.config_file = filename local ok, level, err = config.load(filename); if not ok then print("\n"); @@ -240,7 +241,7 @@ function prosody.reload_config() log("info", "Reloading configuration file"); prosody.events.fire_event("reloading-config"); - local ok, level, err = config.load((rawget(_G, "CFG_CONFIGDIR") or ".").."/prosody.cfg.lua"); + local ok, level, err = config.load(prosody.config_file); if not ok then if level == "parser" then log("error", "There was an error parsing the configuration file: %s", tostring(err));
