aboutsummaryrefslogtreecommitdiffstats
path: root/core/sessionmanager.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2015-04-03 19:34:47 +0100
committerMatthew Wild <mwild1@gmail.com>2015-04-03 19:34:47 +0100
commitbb866fc12337b648ad43b4cce6753e5ab8de251a (patch)
treeed4ed89ea492be641fddc99be7d2da14e5015e51 /core/sessionmanager.lua
parent609d0795b4737b9bda5f5770507529a7f278808f (diff)
parent5a53fb4df8f81b02712a18c911a7c5db12a584c3 (diff)
downloadprosody-bb866fc12337b648ad43b4cce6753e5ab8de251a.tar.gz
prosody-bb866fc12337b648ad43b4cce6753e5ab8de251a.zip
Merge 0.10->trunk
Diffstat (limited to 'core/sessionmanager.lua')
-rw-r--r--core/sessionmanager.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua
index 8767e869..d833dbe5 100644
--- a/core/sessionmanager.lua
+++ b/core/sessionmanager.lua
@@ -193,8 +193,8 @@ function bind_resource(session, resource)
return true;
end
-function send_to_available_resources(user, host, stanza)
- local jid = user.."@"..host;
+function send_to_available_resources(username, host, stanza)
+ local jid = username.."@"..host;
local count = 0;
local user = bare_sessions[jid];
if user then