Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

[friendica.git] / mod / item.php

diff --git a/mod/item.php b/mod/item.php
index c30b1745777437859e42871282aec3aeaefb4ca1..642a6758aa0eaeabed7e8aecea015b544f570300 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -272,8 +272,7 @@ function item_post(&$a) {
 
        $plaintext = (local_user() ? intval(get_pconfig(local_user(),'system','plaintext')) : 0);
        if((! $parent) && (! $api_source) && (! $plaintext)) {
-               $body = str_replace("\r\n","\n",$body);
-               $body = str_replace("\n\n","\n",$body);
+               $body = fix_mce_lf($body);
        }
 
 
@@ -760,7 +759,7 @@ function item_post(&$a) {
        }
        else {
                logger('mod_item: unable to retrieve post that was just stored.');
-               notify( t('System error. Post not saved.'));
+               notice( t('System error. Post not saved.') . EOL);
                goaway($a->get_baseurl() . "/" . $return_path );
                // NOTREACHED
        }