aboutsummaryrefslogtreecommitdiff
path: root/src/mod_muc_sql.erl
diff options
context:
space:
mode:
Diffstat (limited to 'src/mod_muc_sql.erl')
-rw-r--r--src/mod_muc_sql.erl13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/mod_muc_sql.erl b/src/mod_muc_sql.erl
index 12487e628..f041257f8 100644
--- a/src/mod_muc_sql.erl
+++ b/src/mod_muc_sql.erl
@@ -409,14 +409,15 @@ import(_, _, _) ->
get_subscribed_rooms(LServer, Host, Jid) ->
JidS = jid:encode(Jid),
- case catch ejabberd_sql:sql_query(
- LServer,
- ?SQL("select @(room)s, @(nodes)s from muc_room_subscribers where jid=%(JidS)s"
- " and host=%(Host)s")) of
+ case ejabberd_sql:sql_query(
+ LServer,
+ ?SQL("select @(room)s, @(nodes)s from muc_room_subscribers "
+ "where jid=%(JidS)s and host=%(Host)s")) of
{selected, Subs} ->
- [{jid:make(Room, Host, <<>>), ejabberd_sql:decode_term(Nodes)} || {Room, Nodes} <- Subs];
+ {ok, [{jid:make(Room, Host), ejabberd_sql:decode_term(Nodes)}
+ || {Room, Nodes} <- Subs]};
_Error ->
- []
+ {error, db_failure}
end.
%%%===================================================================