Chapril
/
xmpp.chapril.org-ejabberd
mirror of https://github.com/processone/ejabberd.git
24
1
Fork 0
Code Releases Activity

get_items bugfix (EJAB-716) 

SVN Revision: 1541
This commit is contained in:
Christophe Romain 2008-08-25 22:51:17 +00:00
parent 28c34a844a
commit d5df314295
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2008-08-26 Christophe Romain <christophe.romain@process-one.net>
* src/mod_pubsub/mod_pubsub.erl: get_items bugfix (EJAB-716)
2008-08-25 Christophe Romain <christophe.romain@process-one.net>
* src/mod_privacy_odbc.erl: Prevent case_clause error when

6
src/mod_pubsub/mod_pubsub.erl
View File

@ -933,7 +933,7 @@ iq_pubsub(Host, ServerHost, From, IQType, SubEl, _Lang, Access, Plugins) ->
({xmlelement, "item", ItemAttrs, _}, Acc) ->
case xml:get_attr_s("id", ItemAttrs) of
"" -> Acc;
ItemID -> ItemID
ItemID -> [ItemID|Acc]
end;
(_, Acc) ->
Acc
@ -1692,8 +1692,8 @@ get_items(Host, Node, From, SubId, SMaxItems, ItemIDs) ->
[] ->
Items;
_ ->
lists:filter(fun(Item) ->
lists:member(Item, ItemIDs)
lists:filter(fun(#pubsub_item{itemid = {ItemId, _}}) ->
lists:member(ItemId, ItemIDs)
end, Items)
end,
%% Generate the XML response (Item list), limiting the