diff options
| author | Matthew Wild <mwild1@gmail.com> | 2012-07-28 01:14:31 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2012-07-28 01:14:31 +0100 |
| commit | fbe75768718891167313bc0cbcffcd3a46042d31 (patch) | |
| tree | 2732225257e7b8ade28695dad7c0df3f7cea00b1 /util/stanza.lua | |
| parent | 8395775fc1bd1e72a8c83927003d2af1ed5f304a (diff) | |
| parent | f926338983c2f1dd0276d41e3c3d8e28cbef3d02 (diff) | |
| download | prosody-fbe75768718891167313bc0cbcffcd3a46042d31.tar.gz prosody-fbe75768718891167313bc0cbcffcd3a46042d31.zip | |
Merge with Florob
Diffstat (limited to 'util/stanza.lua')
| -rw-r--r-- | util/stanza.lua | 4 |
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 |