diff options
Diffstat (limited to 'src/mod_mam.erl')
| -rw-r--r-- | src/mod_mam.erl | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/mod_mam.erl b/src/mod_mam.erl index f84519a08..317fddfc5 100644 --- a/src/mod_mam.erl +++ b/src/mod_mam.erl @@ -812,9 +812,9 @@ select(_LServer, JidRequestor, JidArchive, Start, End, _With, RSM, _ -> {Msgs, true, L} end; -select(LServer, From, From, Start, End, With, RSM, MsgType) -> +select(LServer, From, To, Start, End, With, RSM, MsgType) -> Mod = gen_mod:db_mod(LServer, ?MODULE), - Mod:select(LServer, From, From, Start, End, With, RSM, MsgType). + Mod:select(LServer, From, To, Start, End, With, RSM, MsgType). msg_to_el(#archive_msg{timestamp = TS, packet = Pkt1, nick = Nick, peer = Peer}, MsgType, JidRequestor, #jid{lserver = LServer} = JidArchive) -> @@ -1017,12 +1017,7 @@ mod_opt_type(cache_life_time) -> fun (I) when is_integer(I), I > 0 -> I end; mod_opt_type(cache_size) -> fun (I) when is_integer(I), I > 0 -> I end; -mod_opt_type(db_type) -> - fun(sql) -> sql; - (odbc) -> sql; - (internal) -> mnesia; - (mnesia) -> mnesia - end; +mod_opt_type(db_type) -> fun(T) -> ejabberd_config:v_db(?MODULE, T) end; mod_opt_type(default) -> fun (always) -> always; (never) -> never; |