aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-12-13 12:53:14 +0000
committerMatthew Wild <mwild1@gmail.com>2013-12-13 12:53:14 +0000
commitc680f0d75a09ea19ca159d14ffb68e40ada91c90 (patch)
tree706e1bd214c36daa363bfd6749ab4cafec8faa81
parent0b0e5d0825a2fa2b7ef28423824886b30bb916d7 (diff)
parentd4a3ab7b750918ceb5a2c01def4bebab0a9a8230 (diff)
downloadprosody-c680f0d75a09ea19ca159d14ffb68e40ada91c90.tar.gz
prosody-c680f0d75a09ea19ca159d14ffb68e40ada91c90.zip
Merge 0.10->trunk
-rw-r--r--plugins/muc/mod_muc.lua2
-rwxr-xr-xprosody3
2 files changed, 3 insertions, 2 deletions
diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua
index cb967c90..38c97d61 100644
--- a/plugins/muc/mod_muc.lua
+++ b/plugins/muc/mod_muc.lua
@@ -164,7 +164,7 @@ function stanza_handler(event)
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
diff --git a/prosody b/prosody
index 1a0f6ff2..b411370f 100755
--- a/prosody
+++ b/prosody
@@ -86,6 +86,7 @@ function read_config()
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 init_global_state()
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));