aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2015-10-02 12:13:32 +0200
committerKim Alvefur <zash@zash.se>2015-10-02 12:13:32 +0200
commit70775be1a0515ec0c52986541c7f9e0038cc9604 (patch)
treefdbe2b55e4c4f871de4fc6cb9aa004e0da258221
parent3fc78cf2154d9a870763a06801bd167ddabf1c61 (diff)
parentd208ade2a7afd0b03932cc24103486076ab20a42 (diff)
downloadprosody-70775be1a0515ec0c52986541c7f9e0038cc9604.tar.gz
prosody-70775be1a0515ec0c52986541c7f9e0038cc9604.zip
Merge 0.10->trunk
-rw-r--r--util/jid.lua6
1 files changed, 5 insertions, 1 deletions
diff --git a/util/jid.lua b/util/jid.lua
index 696f51d8..4dd7b04d 100644
--- a/util/jid.lua
+++ b/util/jid.lua
@@ -36,7 +36,11 @@ local function split(jid)
end
local function bare(jid)
- return jid and match(jid, "^[^/]+");
+ local node, host = _split(jid);
+ if node and host then
+ return node.."@"..host;
+ end
+ return host;
end
local function prepped_split(jid)