diff options
author | Kim Alvefur <zash@zash.se> | 2014-10-05 15:37:46 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2014-10-05 15:37:46 +0200 |
commit | eab5feadd71d6a044ecfcc8131fd3b7ed350dc97 (patch) | |
tree | c419f2d0ba15e1d5364c44a1e2b6f89e99f16f85 /plugins/mod_blocklist.lua | |
parent | acf786ed7dcca32a0ee768fac6f33d35674fc1b6 (diff) | |
parent | e4a6b7e39a2f9159ebd9da49771a40ff10474866 (diff) | |
download | prosody-eab5feadd71d6a044ecfcc8131fd3b7ed350dc97.tar.gz prosody-eab5feadd71d6a044ecfcc8131fd3b7ed350dc97.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_blocklist.lua')
-rw-r--r-- | plugins/mod_blocklist.lua | 2 |
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); |