aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristophe Romain <christophe.romain@process-one.net>2008-04-30 08:49:39 +0000
committerChristophe Romain <christophe.romain@process-one.net>2008-04-30 08:49:39 +0000
commit2304f8cbc80c5d0730c2b3970ccc7ca54dc19ecf (patch)
tree812c603bb070ac6fa8556b1c764c21991e854b55
parent* src/ejabberd_s2s_out.erl: Improve confusing log message in s2s (diff)
XEP-0115 patch (EJAB-618)
SVN Revision: 1313
-rw-r--r--ChangeLog4
-rw-r--r--src/mod_caps.erl3
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a556fe042..034243bf2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-04-30 Christophe Romain <christophe.romain@process-one.net>
+
+ * src/mod_caps.erl: XEP-0115 patch (EJAB-618)
+
2008-04-29 Badlop <badlop@process-one.net>
* src/ejabberd_s2s_out.erl: Improve confusing log message in s2s
diff --git a/src/mod_caps.erl b/src/mod_caps.erl
index dee9078a9..2be0fac66 100644
--- a/src/mod_caps.erl
+++ b/src/mod_caps.erl
@@ -214,7 +214,8 @@ handle_cast({note_caps, From,
[{"type", "get"},
{"id", ID}],
[{xmlelement, "query",
- [{"xmlns", ?NS_DISCO_INFO}],
+ [{"xmlns", ?NS_DISCO_INFO},
+ {"node", lists:concat([Node, "#", SubNode])}],
[]}]},
ejabberd_local:register_iq_response_handler
(Host, ID, ?MODULE, handle_disco_response),