aboutsummaryrefslogtreecommitdiffstats
path: root/mod/message.php
diff options
context:
space:
mode:
authorMichael <icarus@dabo.de>2012-04-11 18:48:58 +0200
committerMichael <icarus@dabo.de>2012-04-11 18:48:58 +0200
commit39405c8056b4a1d55c97fb2963d8776695dbeb30 (patch)
treec9f89ba0e9aacee343cf50b6b8a64468bb8db694 /mod/message.php
parentc3139fa0fd49b0b4de4568d46a6946c75ccb2a62 (diff)
parentcdb6510b9f3007d2afd3081313caa7d045af1e7c (diff)
downloadvolse-hubzilla-39405c8056b4a1d55c97fb2963d8776695dbeb30.tar.gz
volse-hubzilla-39405c8056b4a1d55c97fb2963d8776695dbeb30.tar.bz2
volse-hubzilla-39405c8056b4a1d55c97fb2963d8776695dbeb30.zip
Merge remote branch 'upstream/master'
Diffstat (limited to 'mod/message.php')
-rw-r--r--mod/message.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/mod/message.php b/mod/message.php
index 1369fde2e..260f4bb14 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -48,8 +48,7 @@ function message_post(&$a) {
$plaintext = intval(get_pconfig(local_user(),'system','plaintext'));
if(! $plaintext) {
- $body = str_replace("\r\n","\n",$body);
- $body = str_replace("\n\n","\n",$body);
+ $body = fix_mce_lf($body);
}
$ret = send_message($recipient, $body, $subject, $replyto);