25
1
mirror of https://github.com/processone/ejabberd.git synced 2024-11-26 16:26:24 +01:00
This commit is contained in:
Christophe Romain 2011-02-09 16:32:11 +01:00
parent 975e7f47ee
commit 96d1400792
2 changed files with 3 additions and 3 deletions

View File

@ -3416,7 +3416,7 @@ sub_with_options(#pubsub_node{type = Type, id = NodeId}) ->
[] []
end. end.
sub_with_options(JID, NodeId, SubId) -> sub_with_options(JID, NodeId, SubId) ->
case pubsub_subscription_odbc:read_subscription(Entity, NodeId, SubId) of case pubsub_subscription_odbc:read_subscription(JID, NodeId, SubId) of
{result, #pubsub_subscription{options = Options}} -> {JID, SubId, Options}; {result, #pubsub_subscription{options = Options}} -> {JID, SubId, Options};
_ -> {JID, SubId, []} _ -> {JID, SubId, []}
end. end.

View File

@ -1,5 +1,5 @@
--- mod_pubsub.erl 2011-02-09 14:26:03.000000000 +0100 --- mod_pubsub.erl 2011-02-09 14:26:03.000000000 +0100
+++ mod_pubsub_odbc.erl 2011-02-09 14:26:41.000000000 +0100 +++ mod_pubsub_odbc.erl 2011-02-09 16:31:15.000000000 +0100
@@ -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.
@ -763,7 +763,7 @@
sub_with_options(JID, NodeId, SubId) -> sub_with_options(JID, NodeId, SubId) ->
- case pubsub_subscription:read_subscription(JID, NodeId, SubId) of - case pubsub_subscription:read_subscription(JID, NodeId, SubId) of
- #pubsub_subscription{options = Options} -> {JID, SubId, Options}; - #pubsub_subscription{options = Options} -> {JID, SubId, Options};
+ case pubsub_subscription_odbc:read_subscription(Entity, NodeId, SubId) of + case pubsub_subscription_odbc:read_subscription(JID, NodeId, SubId) of
+ {result, #pubsub_subscription{options = Options}} -> {JID, SubId, Options}; + {result, #pubsub_subscription{options = Options}} -> {JID, SubId, Options};
_ -> {JID, SubId, []} _ -> {JID, SubId, []}
end. end.