Changeset

6890:47cd0b4b5544

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 02 Oct 2015 12:13:32 +0200
parents 6888:39c5c49616ab (current diff) 6889:7f7920f2aebf (diff)
children 6892:214a62915368
files
diffstat 1 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/util/jid.lua	Sun Sep 27 00:37:18 2015 +0200
+++ b/util/jid.lua	Fri Oct 02 12:13:32 2015 +0200
@@ -36,7 +36,11 @@
 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)