Merge hoelzro->trunk

[prosody.git] / util / stanza.lua

diff --git a/util/stanza.lua b/util/stanza.lua
index 50fe02f0b7cb9ded4fcbd0da7f791ca9b38b2bbf..28e26e0a407232701ce7b2bdc8af0efa41e473e3 100644 (file)
--- a/util/stanza.lua
+++ b/util/stanza.lua
@@ -126,7 +126,7 @@ function stanza_mt:children()
                end, self, i;
 end
 
-function stanza_mt:matched_children(name, xmlns)
+function stanza_mt:matching_tags(name, xmlns)
        xmlns = xmlns or self.attr.xmlns;
        local tags = self.tags;
        local start_i, max_i = 1, #tags;
@@ -343,7 +343,7 @@ function message(attr, body)
        if not body then
                return stanza("message", attr);
        else
-               return stanza("message", attr):tag("body"):text(body);
+               return stanza("message", attr):tag("body"):text(body):up();
        end
 end
 function iq(attr)