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

Fix bad pattern matching on undefined resource

Browse Source
This commit is contained in:
Christophe Romain 2010-06-10 18:26:21 +02:00
parent 5d1d797330
commit 2028698336
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mod_pubsub/mod_pubsub.erl
View File

@ -740,7 +740,7 @@ out_subscription(User, Server, JID, subscribed) ->
Owner = exmpp_jid:make(User, Server, ""), Owner = exmpp_jid:make(User, Server, ""),
{U, S, R} = jlib:short_prepd_jid(JID), {U, S, R} = jlib:short_prepd_jid(JID),
Rs = case R of Rs = case R of
[] -> user_resources(U, S); undefined -> user_resources(U, S);
_ -> [R] _ -> [R]
end, end,
presence(Server, {presence, U, S, Rs, Owner}); presence(Server, {presence, U, S, Rs, Owner});

2
src/mod_pubsub/mod_pubsub_odbc.erl
View File

@ -550,7 +550,7 @@ out_subscription(User, Server, JID, subscribed) ->
Owner = exmpp_jid:make(User, Server, ""), Owner = exmpp_jid:make(User, Server, ""),
{U, S, R} = jlib:short_prepd_jid(JID), {U, S, R} = jlib:short_prepd_jid(JID),
Rs = case R of Rs = case R of
[] -> user_resources(U, S); undefined -> user_resources(U, S);
_ -> [R] _ -> [R]
end, end,
presence(Server, {presence, U, S, Rs, Owner}); presence(Server, {presence, U, S, Rs, Owner});

4
src/mod_pubsub/pubsub_odbc.patch
View File

@ -1,5 +1,5 @@
--- mod_pubsub.erl 2010-06-10 14:25:01.000000000 +0200 --- mod_pubsub.erl 2010-06-10 18:25:27.000000000 +0200
+++ mod_pubsub_odbc.erl 2010-06-10 14:25:09.000000000 +0200 +++ mod_pubsub_odbc.erl 2010-06-10 18:25:34.000000000 +0200
@@ -42,7 +42,7 @@ @@ -42,7 +42,7 @@
%%% 6.2.3.1, 6.2.3.5, and 6.3. For information on subscription leases see %%% 6.2.3.1, 6.2.3.5, and 6.3. For information on subscription leases see
%%% XEP-0060 section 12.18. %%% XEP-0060 section 12.18.