Diff

util/stanza.lua @ 2960:de405832bfb6

Merge 0.6/MattJ -> 0.6
author Matthew Wild <mwild1@gmail.com>
date Sat, 03 Apr 2010 22:26:14 +0100
parent 2956:15a145a67044
child 2961:db3c0ecce3f4
line wrap: on
line diff
--- a/util/stanza.lua	Sat Apr 03 22:24:39 2010 +0100
+++ b/util/stanza.lua	Sat Apr 03 22:26:14 2010 +0100
@@ -38,6 +38,8 @@
 	end
 end
 
+local xmlns_stanzas = "urn:ietf:params:xml:ns:xmpp-stanzas";
+
 module "stanza"
 
 stanza_mt = { __type = "stanza" };
@@ -223,14 +225,14 @@
 		for i=1,#attr do attr[i] = nil; end
 		local attrx = {};
 		for att in pairs(attr) do
-			if s_find(att, "|", 1, true) and not s_find(k, "\1", 1, true) then
-				local ns,na = s_match(k, "^([^|]+)|(.+)$");
+			if s_find(att, "|", 1, true) and not s_find(att, "\1", 1, true) then
+				local ns,na = s_match(att, "^([^|]+)|(.+)$");
 				attrx[ns.."\1"..na] = attr[att];
 				attr[att] = nil;
 			end
 		end
 		for a,v in pairs(attrx) do
-			attr[x] = v;
+			attr[a] = v;
 		end
 		setmetatable(stanza, stanza_mt);
 		for _, child in ipairs(stanza) do