diff options
| author | Badlop <badlop@process-one.net> | 2007-12-04 11:38:00 +0000 |
|---|---|---|
| committer | Badlop <badlop@process-one.net> | 2007-12-04 11:38:00 +0000 |
| commit | 1724ee2b1572f2c2a178cbbc5ed03939ad45ad24 (patch) | |
| tree | 869b66dbf7d775ac129a0ef4e6e59447bb5e47c3 | |
| parent | * ChangeLog: Fix conflict. (diff) | |
* src/mod_pubsub/mod_pubsub.erl: Bugfix: don't report the Jabber
server as a pubsub service.
SVN Revision: 1019
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | src/mod_pubsub/mod_pubsub.erl | 7 |
2 files changed, 7 insertions, 5 deletions
@@ -1,3 +1,8 @@ +2007-12-04 Badlop <badlop@process-one.net> + + * src/mod_pubsub/mod_pubsub.erl: Bugfix: don't report the Jabber + server as a pubsub service. + 2007-12-03 Mickael Remond <mremond@process-one.net> * src/mod_muc.erl: Added option to limit the number of room a user is diff --git a/src/mod_pubsub/mod_pubsub.erl b/src/mod_pubsub/mod_pubsub.erl index c218e1711..dc9dd4a5d 100644 --- a/src/mod_pubsub/mod_pubsub.erl +++ b/src/mod_pubsub/mod_pubsub.erl @@ -294,15 +294,12 @@ update_database(Host) -> %% disco_local_identity(Acc, _From, _To, [], _Lang) -> - Acc ++ [{xmlelement, "identity", [{"category", "pubsub"}, {"type", "service"}], []}, - {xmlelement, "identity", [{"category", "pubsub"}, {"type", "pep"}], []} ]; + Acc ++ [{xmlelement, "identity", [{"category", "pubsub"}, {"type", "pep"}], []} ]; disco_local_identity(Acc, _From, _To, _Node, _Lang) -> Acc. disco_sm_identity(Acc, _From, _To, [], _Lang) -> - Acc ++ [ - {xmlelement, "identity", [{"category", "pubsub"}, {"type", "service"}], []}, - {xmlelement, "identity", [{"category", "pubsub"}, {"type", "pep"}], []} ]; + Acc ++ [{xmlelement, "identity", [{"category", "pubsub"}, {"type", "pep"}], []} ]; disco_sm_identity(Acc, From, To, Node, _Lang) -> LOwner = jlib:jid_tolower(jlib:jid_remove_resource(To)), Acc ++ case node_disco_identity(LOwner, From, Node) of |