diff options
| author | Alexey Shchepin <alexey@process-one.net> | 2006-03-05 04:55:43 +0000 |
|---|---|---|
| committer | Alexey Shchepin <alexey@process-one.net> | 2006-03-05 04:55:43 +0000 |
| commit | d837cb9e8d6a766187f766f2df09ded975ecd650 (patch) | |
| tree | f17c534a10bc6160304e98c5881c0473bafd82e8 | |
| parent | * src/ejabberd_logger_h.erl: reopen-log function now rename the log (diff) | |
* src/ejabberd_c2s.erl: Bugfix
* src/ejabberd_auth_odbc.erl: Bugfix
SVN Revision: 515
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | src/ejabberd_auth_odbc.erl | 2 | ||||
| -rw-r--r-- | src/ejabberd_c2s.erl | 8 |
3 files changed, 11 insertions, 5 deletions
@@ -1,3 +1,9 @@ +2006-03-05 Alexey Shchepin <alexey@sevcom.net> + + * src/ejabberd_c2s.erl: Bugfix + + * src/ejabberd_auth_odbc.erl: Bugfix + 2006-03-04 Mickael Remond <mickael.remond@process-one.net> * src/ejabberd_logger_h.erl: reopen-log function now rename the log diff --git a/src/ejabberd_auth_odbc.erl b/src/ejabberd_auth_odbc.erl index be1c8d4db..7b7459451 100644 --- a/src/ejabberd_auth_odbc.erl +++ b/src/ejabberd_auth_odbc.erl @@ -35,7 +35,7 @@ %%%---------------------------------------------------------------------- start(Host) -> ChildSpec = - {ejabberd_odbc_sup, + {gen_mod:get_module_proc(Host, ejabberd_odbc_sup), {ejabberd_odbc_sup, start_link, [Host]}, temporary, infinity, diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl index b193f8a14..1775904de 100644 --- a/src/ejabberd_c2s.erl +++ b/src/ejabberd_c2s.erl @@ -1306,28 +1306,28 @@ presence_track(From, To, Packet, StateData) -> StateData#state{pres_i = I, pres_a = A}; "subscribe" -> - ejabberd_router:route(jlib:jid_remove_resource(From), To, Packet), ejabberd_hooks:run(roster_out_subscription, Server, [User, Server, To, subscribe]), + ejabberd_router:route(jlib:jid_remove_resource(From), To, Packet), StateData; "subscribed" -> - ejabberd_router:route(jlib:jid_remove_resource(From), To, Packet), ejabberd_hooks:run(roster_out_subscription, Server, [User, Server, To, subscribed]), + ejabberd_router:route(jlib:jid_remove_resource(From), To, Packet), StateData; "unsubscribe" -> - ejabberd_router:route(jlib:jid_remove_resource(From), To, Packet), ejabberd_hooks:run(roster_out_subscription, Server, [User, Server, To, unsubscribe]), + ejabberd_router:route(jlib:jid_remove_resource(From), To, Packet), StateData; "unsubscribed" -> - ejabberd_router:route(jlib:jid_remove_resource(From), To, Packet), ejabberd_hooks:run(roster_out_subscription, Server, [User, Server, To, unsubscribed]), + ejabberd_router:route(jlib:jid_remove_resource(From), To, Packet), StateData; "error" -> ejabberd_router:route(From, To, Packet), |