diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2012-04-27 19:52:05 +1000 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2012-04-27 19:52:05 +1000 |
| commit | 437f68a9f320a3cafd063ae03313ce83db96668e (patch) | |
| tree | 89c5c7ba4fd1edd4572d8857c3099546b6e43346 /src/acl.erl | |
| parent | Update ejabberd version number to 2.1.11 (diff) | |
Merge SQL and Mnesia code into one module (EJAB-1560)
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. |