diff options
| author | Christophe Romain <christophe.romain@process-one.net> | 2008-10-16 22:12:05 +0000 |
|---|---|---|
| committer | Christophe Romain <christophe.romain@process-one.net> | 2008-10-16 22:12:05 +0000 |
| commit | a910c4baa1e12ed2407ea0b598379eeb5e4cdde4 (patch) | |
| tree | 7924b33f6a02efec37f7bd178f38c8e5e51faefe /src/mod_pubsub/mod_pubsub.erl | |
| parent | fix pubsub_publish_item hook ServerHost parameter (EJAB-772) (diff) | |
fix badarg issue on get_roster_info when allowed roster groups is not defined
SVN Revision: 1656
Diffstat (limited to 'src/mod_pubsub/mod_pubsub.erl')
| -rw-r--r-- | src/mod_pubsub/mod_pubsub.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mod_pubsub/mod_pubsub.erl b/src/mod_pubsub/mod_pubsub.erl index 7fb9334da..aa395743a 100644 --- a/src/mod_pubsub/mod_pubsub.erl +++ b/src/mod_pubsub/mod_pubsub.erl @@ -496,7 +496,7 @@ handle_cast({presence, JID, Pid}, State) -> whitelist -> false; % subscribers are added manually authorize -> false; % likewise roster -> - Grps = get_option(Options, roster_groups_allowed), + Grps = get_option(Options, roster_groups_allowed, []), element(2, get_roster_info(User, Server, LJID, Grps)) end, if Subscribed -> @@ -1349,7 +1349,7 @@ subscribe_node(Host, Node, From, JID) -> SubscribeConfig = get_option(Options, subscribe), AccessModel = get_option(Options, access_model), SendLast = get_option(Options, send_last_published_item), - AllowedGroups = get_option(Options, roster_groups_allowed), + AllowedGroups = get_option(Options, roster_groups_allowed, []), {PresenceSubscription, RosterGroup} = case Host of {OUser, OServer, _} -> @@ -1660,7 +1660,7 @@ get_items(Host, Node, From, SubId, SMaxItems, ItemIDs) -> RetreiveFeature = lists:member("retrieve-items", Features), PersistentFeature = lists:member("persistent-items", Features), AccessModel = get_option(Options, access_model), - AllowedGroups = get_option(Options, roster_groups_allowed), + AllowedGroups = get_option(Options, roster_groups_allowed, []), {PresenceSubscription, RosterGroup} = case Host of {OUser, OServer, _} -> @@ -2507,7 +2507,7 @@ get_configure_xfields(_Type, Options, Lang, _Owners) -> {"label", translate:translate(Lang, "Roster groups allowed to subscribe")}, {"var", "pubsub#roster_groups_allowed"}], [{xmlelement, "value", [], [{xmlcdata, Value}]} || - Value <- get_option(Options, roster_groups_allowed)]}, + Value <- get_option(Options, roster_groups_allowed, [])]}, ?ALIST_CONFIG_FIELD("Specify the publisher model", publish_model, [publishers, subscribers, open]), ?INTEGER_CONFIG_FIELD("Max payload size in bytes", max_payload_size), |