diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2012-05-04 14:19:52 +1000 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2012-05-04 14:19:52 +1000 |
| commit | 75d3152a0f87c9c706ba306cb3b8725cfd81818e (patch) | |
| tree | 5f4d6f03d1abc79c94e07c7e486e0efb101dfc3e /src/acl.erl | |
| parent | Remove CRLFs introduced in the previous merge (diff) | |
| parent | Repeated http-bind request should abort only requests with same rid (diff) | |
Merge branch '2.1.x' into 2.2.x
Conflicts:
src/mod_muc/mod_muc.erl
src/mod_muc/mod_muc_room.erl
src/mod_offline.erl
src/mod_offline_odbc.erl
src/mod_shared_roster.erl
src/web/ejabberd_http_bind.erl
Diffstat (limited to 'src/acl.erl')
| -rw-r--r-- | src/acl.erl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/acl.erl b/src/acl.erl index dd7c441de..6ce11f99a 100644 --- a/src/acl.erl +++ b/src/acl.erl @@ -241,9 +241,9 @@ is_glob_match(String, Glob) -> is_regexp_match(String, ejabberd_regexp:sh_to_awk(Glob)). loaded_shared_roster_module(Host) -> - case {gen_mod:is_loaded(Host, mod_shared_roster_odbc), - gen_mod:is_loaded(Host, mod_shared_roster_ldap)} of - {true, _} -> mod_shared_roster_odbc; - {_, true} -> mod_shared_roster_ldap; - _ -> mod_shared_roster + case gen_mod:is_loaded(Host, mod_shared_roster_ldap) of + true -> + mod_shared_roster_ldap; + false -> + mod_shared_roster end. |