Project: ejabberd

Revision: 1542

Author: cromain

Date: 25 Aug 2008 18:54:48

• /trunk/src/mod_pubsub/mod_pubsub.erl

  ......	@@ -932,7 +932,7 @@
  932	932	({xmlelement, "item", ItemAttrs, _}, Acc) ->
  933	933	case xml:get_attr_s("id", ItemAttrs) of
  934	934	"" -> Acc;
  935		ItemID -> ItemID
  	935	ItemID -> [ItemID|Acc]
  936	936	end;
  937	937	(_, Acc) ->
  938	938	Acc
  ......	@@ -1691,8 +1691,8 @@
  1691	1691	[] ->
  1692	1692	Items;
  1693	1693	_ ->
  1694		lists:filter(fun(Item) ->
  1695		lists:member(Item, ItemIDs)
  	1694	lists:filter(fun(#pubsub_item{itemid = {ItemId, _}}) ->
  	1695	lists:member(ItemId, ItemIDs)
  1696	1696	end, Items)
  1697	1697	end,
  1698	1698	%% Generate the XML response (Item list), limiting the

• /trunk/ChangeLog

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