summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Shchepin <alexey@process-one.net>2006-08-01 23:32:56 +0000
committerAlexey Shchepin <alexey@process-one.net>2006-08-01 23:32:56 +0000
commitab2e19a399767b18316d4dba26aafb3f8170da0b (patch)
tree2aff0823bab92e3ea7250e6fe1feabd83ba0dfdc
parent* src/ejabberd_c2s.erl: Bugfix: added a missing catch and fixed (diff)
* src/mod_roster_odbc.erl: Bugfix
SVN Revision: 591
Diffstat (limited to '')
-rw-r--r--ChangeLog4
-rw-r--r--src/mod_roster_odbc.erl2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index cb262e43..df259fc3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-08-02 Alexey Shchepin <alexey@sevcom.net>
+
+ * src/mod_roster_odbc.erl: Bugfix
+
2006-07-28 Mickael Remond <mickael.remond@process-one.net>
* src/ejabberd_c2s.erl: Bugfix: added a missing catch and fixed the
diff --git a/src/mod_roster_odbc.erl b/src/mod_roster_odbc.erl
index dfea3848..1f84f695 100644
--- a/src/mod_roster_odbc.erl
+++ b/src/mod_roster_odbc.erl
@@ -484,7 +484,7 @@ process_subscription(Direction, User, Server, JID1, Type, Reason) ->
R#roster{groups = Groups};
{selected,
["username", "jid", "nick", "subscription", "ask",
- "server", "subscribe", "type"],
+ "askmessage", "server", "subscribe", "type"],
[]} ->
#roster{usj = {LUser, LServer, LJID},
us = {LUser, LServer},