aboutsummaryrefslogtreecommitdiffstats
path: root/util/stanza.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-07-05 17:40:12 +0100
committerMatthew Wild <mwild1@gmail.com>2012-07-05 17:40:12 +0100
commitd7fbc07ca4b77809e07fc47e60f4ca87a7e9f997 (patch)
treed14b44262cee1dc74af32fbaa4658385b9552152 /util/stanza.lua
parentbb7fd8bb306ea2d2893bb7c5bc460ec2f9886687 (diff)
parent02dc79e546ce19f54b858c102943ee6d80eec584 (diff)
downloadprosody-d7fbc07ca4b77809e07fc47e60f4ca87a7e9f997.tar.gz
prosody-d7fbc07ca4b77809e07fc47e60f4ca87a7e9f997.zip
Merge 0.9->trunk
Diffstat (limited to 'util/stanza.lua')
-rw-r--r--util/stanza.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/util/stanza.lua b/util/stanza.lua
index 1449f707..5c430f1d 100644
--- a/util/stanza.lua
+++ b/util/stanza.lua
@@ -133,14 +133,14 @@ function stanza_mt:children()
end
function stanza_mt:childtags(name, xmlns)
- xmlns = xmlns or self.attr.xmlns;
local tags = self.tags;
local start_i, max_i = 1, #tags;
return function ()
for i = start_i, max_i do
local v = tags[i];
if (not name or v.name == name)
- and (not xmlns or xmlns == v.attr.xmlns) then
+ and ((not xmlns and self.attr.xmlns == v.attr.xmlns)
+ or v.attr.xmlns == xmlns) then
start_i = i+1;
return v;
end