diff options
author | Kim Alvefur <zash@zash.se> | 2015-10-02 12:17:41 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2015-10-02 12:17:41 +0200 |
commit | 6c79c243796faaa674eb591a15257a965b9f30ae (patch) | |
tree | 9a269b858beb01aa83fc44fbceaf5ac72b7bd6fc | |
parent | 6867b873ba4863cbcefc937611a1e1233caac550 (diff) | |
parent | a1b1932a9a385bd2d576b1a39b4931ca04171ce2 (diff) | |
download | prosody-6c79c243796faaa674eb591a15257a965b9f30ae.tar.gz prosody-6c79c243796faaa674eb591a15257a965b9f30ae.zip |
Merge 0.10->trunk
-rw-r--r-- | util/jid.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/util/jid.lua b/util/jid.lua index 4dd7b04d..76155ac7 100644 --- a/util/jid.lua +++ b/util/jid.lua @@ -36,7 +36,7 @@ local function split(jid) end local function bare(jid) - local node, host = _split(jid); + local node, host = split(jid); if node and host then return node.."@"..host; end |