Diff

util/stanza.lua @ 2736:27e8452cb426

Merge with 0.7
author Matthew Wild <mwild1@gmail.com>
date Mon, 01 Mar 2010 21:03:17 +0000
parent 2734:7941617b15f9
child 2925:692b3c6c5bd2
line wrap: on
line diff
--- a/util/stanza.lua	Mon Mar 01 18:08:52 2010 +0000
+++ b/util/stanza.lua	Mon Mar 01 21:03:17 2010 +0000
@@ -247,14 +247,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