mirror of
https://github.com/processone/ejabberd.git
synced 2024-12-26 17:38:45 +01:00
Merge pull request #218 from weiss/omit-iq-xmlns
Omit XML namespace declaration for <iq/> stanzas
This commit is contained in:
commit
b2e84405c1
@ -1373,7 +1373,6 @@ handle_info({route, _From, _To, {broadcast, Data}},
|
|||||||
fsm_next_state(StateName, StateData);
|
fsm_next_state(StateName, StateData);
|
||||||
NewPL ->
|
NewPL ->
|
||||||
PrivPushIQ = #iq{type = set,
|
PrivPushIQ = #iq{type = set,
|
||||||
xmlns = ?NS_PRIVACY,
|
|
||||||
id = <<"push",
|
id = <<"push",
|
||||||
(randoms:get_string())/binary>>,
|
(randoms:get_string())/binary>>,
|
||||||
sub_el =
|
sub_el =
|
||||||
@ -2541,8 +2540,7 @@ route_blocking(What, StateData) ->
|
|||||||
#xmlel{name = <<"unblock">>,
|
#xmlel{name = <<"unblock">>,
|
||||||
attrs = [{<<"xmlns">>, ?NS_BLOCKING}], children = []}
|
attrs = [{<<"xmlns">>, ?NS_BLOCKING}], children = []}
|
||||||
end,
|
end,
|
||||||
PrivPushIQ = #iq{type = set, xmlns = ?NS_BLOCKING,
|
PrivPushIQ = #iq{type = set, id = <<"push">>, sub_el = [SubEl]},
|
||||||
id = <<"push">>, sub_el = [SubEl]},
|
|
||||||
PrivPushEl =
|
PrivPushEl =
|
||||||
jlib:replace_from_to(jlib:jid_remove_resource(StateData#state.jid),
|
jlib:replace_from_to(jlib:jid_remove_resource(StateData#state.jid),
|
||||||
StateData#state.jid, jlib:iq_to_xml(PrivPushIQ)),
|
StateData#state.jid, jlib:iq_to_xml(PrivPushIQ)),
|
||||||
|
Loading…
Reference in New Issue
Block a user