aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-04-07 13:36:58 +0200
committerKim Alvefur <zash@zash.se>2016-04-07 13:36:58 +0200
commitb22eef35d7c97defb727023336fb55a29da0f0e9 (patch)
tree0f39bb10c828be602edc862719b32395eb31a248
parent26261c7a51d04fa39653c75c84b7e0566299d934 (diff)
parentbb95b569ef884a8d6558271382acadcac2f87c66 (diff)
downloadprosody-b22eef35d7c97defb727023336fb55a29da0f0e9.tar.gz
prosody-b22eef35d7c97defb727023336fb55a29da0f0e9.zip
Merge 0.10->trunk
-rw-r--r--core/moduleapi.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/moduleapi.lua b/core/moduleapi.lua
index 8db5c218..9b773f89 100644
--- a/core/moduleapi.lua
+++ b/core/moduleapi.lua
@@ -375,8 +375,8 @@ function api:provides(name, item)
self:add_item(name.."-provider", item);
end
-function api:send(stanza)
- return core_post_stanza(hosts[self.host], stanza);
+function api:send(stanza, origin)
+ return core_post_stanza(origin or hosts[self.host], stanza);
end
function api:broadcast(jids, stanza, iter)