Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-26 16:26:24 +01:00
Code Releases Activity

get_items bugfix (EJAB-716)

Browse Source 
SVN Revision: 1542
This commit is contained in:
Christophe Romain 2008-08-25 22:54:48 +00:00
parent 11f74201ab
commit 0832ad392d
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> 2008-08-25 Christophe Romain <christophe.romain@process-one.net>
* src/mod_privacy_odbc.erl: Prevent case_clause error when * src/mod_privacy_odbc.erl: Prevent case_clause error when

6
src/mod_pubsub/mod_pubsub.erl
View File

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