diff options
| author | Badlop <badlop@process-one.net> | 2008-07-11 13:35:08 +0000 |
|---|---|---|
| committer | Badlop <badlop@process-one.net> | 2008-07-11 13:35:08 +0000 |
| commit | e7b42f949947f4235f2541daf08bc4b3b84c1954 (patch) | |
| tree | 7bebd2c8e35f978bc72820377a9a675dfd11a8f7 /src | |
| parent | * src/configure.ac: Don't check for erlang header file (EJAB-232) (diff) | |
* src/mod_register.erl: Revert support for io_lib newline, since
there is a standard character that representes newline (EJAB-501)
* doc/guide.tex: Update documentation to explain newline character
* doc/guide.html: Likewise
* src/ejabberd.cfg.example: Likewise
SVN Revision: 1436
Diffstat (limited to 'src')
| -rw-r--r-- | src/ejabberd.cfg.example | 2 | ||||
| -rw-r--r-- | src/mod_register.erl | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/ejabberd.cfg.example b/src/ejabberd.cfg.example index eb43bb3ca..022a9ebc2 100644 --- a/src/ejabberd.cfg.example +++ b/src/ejabberd.cfg.example @@ -459,7 +459,7 @@ %% a message with this subject and body. %% {welcome_message, {"Welcome!", - "Hi.~nWelcome to this Jabber server."}}, + "Hi.\nWelcome to this Jabber server."}}, %% %% When a user registers, send a notification to diff --git a/src/mod_register.erl b/src/mod_register.erl index 21080c8a2..a936ea5e1 100644 --- a/src/mod_register.erl +++ b/src/mod_register.erl @@ -241,13 +241,12 @@ send_welcome_message(JID) -> {"", ""} -> ok; {Subj, Body} -> - BodyFormatted = io_lib:format(Body, []), ejabberd_router:route( jlib:make_jid("", Host, ""), JID, {xmlelement, "message", [{"type", "normal"}], [{xmlelement, "subject", [], [{xmlcdata, Subj}]}, - {xmlelement, "body", [], [{xmlcdata, BodyFormatted}]}]}); + {xmlelement, "body", [], [{xmlcdata, Body}]}]}); _ -> ok end. |