Merge 0.10->trunk

1 files changed, 6 insertions, 0 deletions

diff --git a/util/stanza.lua b/util/stanza.lua
index a598a81e..651c1973 100644
--- a/util/stanza.lua
+++ b/util/stanza.lua
@@ -14,6 +14,7 @@ local s_format      = string.format;
 local s_match       =  string.match;
 local tostring      =      tostring;
 local setmetatable  =  setmetatable;
+local getmetatable  =  getmetatable;
 local pairs         =         pairs;
 local ipairs        =        ipairs;
 local type          =          type;
@@ -45,6 +46,10 @@ local function new_stanza(name, attr, namespaces)
 	return setmetatable(stanza, stanza_mt);
 end
 
+local function is_stanza(s)
+	return getmetatable(s) == stanza_mt;
+end
+
 function stanza_mt:query(xmlns)
 	return self:tag("query", { xmlns = xmlns });
 end
@@ -422,6 +427,7 @@ end
 return {
 	stanza_mt = stanza_mt;
 	stanza = new_stanza;
+	is_stanza = is_stanza;
 	new_id = new_id;
 	preserialize = preserialize;
 	deserialize = deserialize;