diff options
| author | Kim Alvefur <zash@zash.se> | 2016-03-11 13:41:10 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-03-11 13:41:10 +0100 |
| commit | 36c4899e39311d14b66188a9b8af1a577ebc7f61 (patch) | |
| tree | 3731b00879faf7182108cc277a9a2c61e5fdc0d0 /plugins | |
| parent | 96bfdd66ff021279115716c0640539e97739f51e (diff) | |
| parent | e1769afc17d978417c95f944ac757ed45b319d92 (diff) | |
| download | prosody-36c4899e39311d14b66188a9b8af1a577ebc7f61.tar.gz prosody-36c4899e39311d14b66188a9b8af1a577ebc7f61.zip | |
Merge 0.10->trunk
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/mod_presence.lua | 2 | ||||
| -rw-r--r-- | plugins/mod_watchregistrations.lua | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/mod_presence.lua b/plugins/mod_presence.lua index ab57a158..76394baf 100644 --- a/plugins/mod_presence.lua +++ b/plugins/mod_presence.lua @@ -51,7 +51,7 @@ local function recalc_resource_map(user) end end -local ignore_presence_priority = module:get_option("ignore_presence_priority"); +local ignore_presence_priority = module:get_option_boolean("ignore_presence_priority", false); function handle_normal_presence(origin, stanza) if ignore_presence_priority then diff --git a/plugins/mod_watchregistrations.lua b/plugins/mod_watchregistrations.lua index b7be5daf..1e696f30 100644 --- a/plugins/mod_watchregistrations.lua +++ b/plugins/mod_watchregistrations.lua @@ -11,7 +11,7 @@ local host = module:get_host(); local jid_prep = require "util.jid".prep; local registration_watchers = module:get_option_set("registration_watchers", module:get_option("admins", {})) / jid_prep; -local registration_notification = module:get_option("registration_notification", "User $username just registered on $host from $ip"); +local registration_notification = module:get_option_string("registration_notification", "User $username just registered on $host from $ip"); local st = require "util.stanza"; |