Commit 1c03bc0a authored by Mario's avatar Mario

Merge branch 'fix/diaspora-bold+linebreak' into 'master'

Fix bold + line break in Diaspora import

See merge request !189
parents f9d7c7e8 0f3fa5bf
......@@ -232,7 +232,7 @@ class Diaspora_Receiver {
}
$body = markdown_to_bb($this->get_body(), false, [ 'diaspora' => true ]);
$body = markdown_to_bb($this->get_body(), false, [ 'diaspora' => true, 'preserve_lf' => true ]);
// photo could be a single photo or an array of photos.
......@@ -1100,7 +1100,7 @@ class Diaspora_Receiver {
continue;
}
$body = markdown_to_bb($msg_text, false, [ 'diaspora' => true ]);
$body = markdown_to_bb($msg_text, false, [ 'diaspora' => true, 'preserve_lf' => true ]);
$maxlen = get_max_import_size();
......@@ -1243,7 +1243,7 @@ class Diaspora_Receiver {
$reply = 0;
$subject = $conversation['subject']; //this is already encoded
$body = markdown_to_bb($msg_text, false, [ 'diaspora' => true ]);
$body = markdown_to_bb($msg_text, false, [ 'diaspora' => true, 'preserve_lf' => true ]);
$maxlen = get_max_import_size();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment