aboutsummaryrefslogtreecommitdiffstats
path: root/core
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
commit463289a6f39dee4b37218bfbf949bbc627e99db8 (patch)
tree0f39bb10c828be602edc862719b32395eb31a248 /core
parent55e77cd89d5969fe0892fd573fe79be6bea9716f (diff)
parentc82d43ec124fcc2bc8a3c516a6f9ec838c64efef (diff)
downloadprosody-463289a6f39dee4b37218bfbf949bbc627e99db8.tar.gz
prosody-463289a6f39dee4b37218bfbf949bbc627e99db8.zip
Merge 0.10->trunk
Diffstat (limited to 'core')
-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)