Merge 0.9->0.10

[prosody.git] / util / jid.lua

diff --git a/util/jid.lua b/util/jid.lua
index 696f51d83ff5e2093f4f7b275ab1c1d70bb63e71..76155ac70f81d7118693ab6f8bfe8d7116196b20 100644 (file)
--- 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)