diff options
| author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2012-03-22 06:27:13 +0100 |
|---|---|---|
| committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2012-03-22 06:27:13 +0100 |
| commit | 5189a56ef832e1c5c6976f87d77d218bf4a6c221 (patch) | |
| tree | 4c1aa63a36eeaadab00c61eb05f3f9f5ae0da095 /mod/item.php | |
| parent | 751e4181e5e875b9f9850700a3687774e4c53ab3 (diff) | |
| parent | d81256d7b051d9a76b087feeb64ac79fb4aeff4d (diff) | |
| download | volse-hubzilla-5189a56ef832e1c5c6976f87d77d218bf4a6c221.tar.gz volse-hubzilla-5189a56ef832e1c5c6976f87d77d218bf4a6c221.tar.bz2 volse-hubzilla-5189a56ef832e1c5c6976f87d77d218bf4a6c221.zip | |
Merge branch 'master' of https://github.com/friendica/friendica
Diffstat (limited to 'mod/item.php')
| -rwxr-xr-x | mod/item.php | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/mod/item.php b/mod/item.php index fe570075f..ee6c5c9a7 100755 --- a/mod/item.php +++ b/mod/item.php @@ -243,6 +243,7 @@ function item_post(&$a) { } + if(! strlen($body)) { if($preview) killme(); @@ -253,6 +254,15 @@ function item_post(&$a) { } } + // Work around doubled linefeeds in Tinymce 3.5b2 + // First figure out if it's a status post that would've been + // created using tinymce. Otherwise leave it alone. + + $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); + } // get contact info for poster |