mirror of
https://github.com/processone/ejabberd.git
synced 2024-09-27 14:30:55 +02:00
Merge r1822 and partial r1834 from trunk:
* src/mod_privacy.erl: Privacy list items must be processed in the specified order (EJAB-848) * src/mod_privacy_odbc.erl: Likewise SVN Revision: 1895
This commit is contained in:
parent
677387bc80
commit
cd29a77759
@ -1,5 +1,9 @@
|
|||||||
2009-02-21 Badlop <badlop@process-one.net>
|
2009-02-21 Badlop <badlop@process-one.net>
|
||||||
|
|
||||||
|
* src/mod_privacy.erl: Privacy list items must be processed in the
|
||||||
|
specified order (EJAB-848)
|
||||||
|
* src/mod_privacy_odbc.erl: Likewise
|
||||||
|
|
||||||
* src/ejabberd_c2s.erl: Ensure unique ID in roster push (EJAB-721)
|
* src/ejabberd_c2s.erl: Ensure unique ID in roster push (EJAB-721)
|
||||||
* src/mod_roster.erl: Likewise
|
* src/mod_roster.erl: Likewise
|
||||||
* src/mod_roster_odbc.erl: Likewise
|
* src/mod_roster_odbc.erl: Likewise
|
||||||
|
@ -414,7 +414,8 @@ parse_items(Els) ->
|
|||||||
parse_items(Els, []).
|
parse_items(Els, []).
|
||||||
|
|
||||||
parse_items([], Res) ->
|
parse_items([], Res) ->
|
||||||
lists:reverse(Res);
|
%% Sort the items by their 'order' attribute
|
||||||
|
lists:keysort(#listitem.order, Res);
|
||||||
parse_items([{xmlelement, "item", Attrs, SubEls} | Els], Res) ->
|
parse_items([{xmlelement, "item", Attrs, SubEls} | Els], Res) ->
|
||||||
Type = xml:get_attr("type", Attrs),
|
Type = xml:get_attr("type", Attrs),
|
||||||
Value = xml:get_attr("value", Attrs),
|
Value = xml:get_attr("value", Attrs),
|
||||||
|
@ -414,7 +414,8 @@ parse_items(Els) ->
|
|||||||
parse_items(Els, []).
|
parse_items(Els, []).
|
||||||
|
|
||||||
parse_items([], Res) ->
|
parse_items([], Res) ->
|
||||||
lists:reverse(Res);
|
%% Sort the items by their 'order' attribute
|
||||||
|
lists:keysort(#listitem.order, Res);
|
||||||
parse_items([{xmlelement, "item", Attrs, SubEls} | Els], Res) ->
|
parse_items([{xmlelement, "item", Attrs, SubEls} | Els], Res) ->
|
||||||
Type = xml:get_attr("type", Attrs),
|
Type = xml:get_attr("type", Attrs),
|
||||||
Value = xml:get_attr("value", Attrs),
|
Value = xml:get_attr("value", Attrs),
|
||||||
|
Loading…
Reference in New Issue
Block a user