Merge 0.12->trunk

1 files changed, 5 insertions, 0 deletions

diff --git a/util/stanza.lua b/util/stanza.lua
index 24f3cb33..c6e7aa6d 100644
--- a/util/stanza.lua
+++ b/util/stanza.lua
@@ -167,6 +167,7 @@ function stanza_mt:get_child(name, xmlns)
 			return child;
 		end
 	end
+	return nil;
 end
 
 function stanza_mt:get_child_text(name, xmlns)
@@ -189,12 +190,14 @@ function stanza_mt:child_with_name(name)
 	for _, child in ipairs(self.tags) do
 		if child.name == name then return child; end
 	end
+	return nil;
 end
 
 function stanza_mt:child_with_ns(ns)
 	for _, child in ipairs(self.tags) do
 		if child.attr.xmlns == ns then return child; end
 	end
+	return nil;
 end
 
 function stanza_mt:get_child_with_attr(name, xmlns, attr_name, attr_value, normalize)
@@ -203,6 +206,7 @@ function stanza_mt:get_child_with_attr(name, xmlns, attr_name, attr_value, norma
 			return tag;
 		end
 	end
+	return nil;
 end
 
 function stanza_mt:children()
@@ -369,6 +373,7 @@ function stanza_mt.get_text(t)
 	if #t.tags == 0 then
 		return t_concat(t);
 	end
+	return nil;
 end
 
 function stanza_mt.get_error(stanza)