From a53efc2b05bdd77c393c566d128d62215853e3af Mon Sep 17 00:00:00 2001 From: Alexey Shchepin Date: Fri, 22 Jun 2007 14:15:43 +0000 Subject: [PATCH] * src/mod_disco.erl: Don't override accumulated value in get_local_identity/5 (thanks to Magnus Henoch and Badlop) SVN Revision: 788 --- ChangeLog | 3 +++ src/mod_disco.erl | 12 ++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 68ef9c438..8e3ae40ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2007-06-22 Alexey Shchepin + * src/mod_disco.erl: Don't override accumulated value in + get_local_identity/5 (thanks to Magnus Henoch and Badlop) + * src/web/ejabberd_web_admin.erl: Added links to server and virtual host homes (thanks to Badlop) diff --git a/src/mod_disco.erl b/src/mod_disco.erl index 22f67da21..7f700fad2 100644 --- a/src/mod_disco.erl +++ b/src/mod_disco.erl @@ -168,12 +168,12 @@ process_local_iq_info(From, To, #iq{type = Type, lang = Lang, end end. -get_local_identity(_Acc, _From, _To, [], _Lang) -> - [{xmlelement, "identity", - [{"category", "server"}, - {"type", "im"}, - {"name", "ejabberd"}], []}]; - +get_local_identity(Acc, _From, _To, [], _Lang) -> + Acc ++ [{xmlelement, "identity", + [{"category", "server"}, + {"type", "im"}, + {"name", "ejabberd"}], []}]; + get_local_identity(Acc, _From, _To, _Node, _Lang) -> Acc.