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/mod_configure.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/mod_configure.erl')
| -rw-r--r-- | src/mod_configure.erl | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/mod_configure.erl b/src/mod_configure.erl index 29b7276ca..44fee1e93 100644 --- a/src/mod_configure.erl +++ b/src/mod_configure.erl @@ -1782,15 +1782,13 @@ stop_node(From, Host, ENode, Action, XData) -> get_last_info(User, Server) -> - ML = lists:member(mod_last, gen_mod:loaded_modules(Server)), - MLO = lists:member(mod_last_odbc, gen_mod:loaded_modules(Server)), - case {ML, MLO} of - {true, _} -> mod_last:get_last_info(User, Server); - {false, true} -> mod_last_odbc:get_last_info(User, Server); - {false, false} -> not_found + case gen_mod:is_loaded(Server, mod_last) of + true -> + mod_last:get_last_info(User, Server); + false -> + not_found end. - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% adhoc_sm_commands(_Acc, From, |