aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_blocklist.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-10-05 15:37:46 +0200
committerKim Alvefur <zash@zash.se>2014-10-05 15:37:46 +0200
commit505ba5222550485aab2d062dc2bf6f7a5bc9b0b0 (patch)
treec419f2d0ba15e1d5364c44a1e2b6f89e99f16f85 /plugins/mod_blocklist.lua
parentf5f64c67636ac8bfc9e1add666229278c689bf0a (diff)
parent3ae8a2ed6ef23c1e7cea54a93b05c624a321cf08 (diff)
downloadprosody-505ba5222550485aab2d062dc2bf6f7a5bc9b0b0.tar.gz
prosody-505ba5222550485aab2d062dc2bf6f7a5bc9b0b0.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_blocklist.lua')
-rw-r--r--plugins/mod_blocklist.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/mod_blocklist.lua b/plugins/mod_blocklist.lua
index dca729f0..1f09ca13 100644
--- a/plugins/mod_blocklist.lua
+++ b/plugins/mod_blocklist.lua
@@ -182,7 +182,7 @@ end);
-- Buggy clients
module:hook("iq-error/self/blocklist-push", function (event)
local type, condition, text = event.stanza:get_error();
- (event.origin.log or module._log)("warn", "client returned an error in response to notification from mod_%s: %s%s%s", module.name, condition, text and ": " or "", text or "");
+ (event.origin.log or module._log)("warn", "Client returned an error in response to notification from mod_%s: %s%s%s", module.name, condition, text and ": " or "", text or "");
return true;
end);