diff options
| author | Fabio Comuni <fabrix.xm@gmail.com> | 2012-03-22 14:56:23 +0100 |
|---|---|---|
| committer | Fabio Comuni <fabrix.xm@gmail.com> | 2012-03-22 14:56:23 +0100 |
| commit | d5a6e7b1767ebc337f31745984f1ce0904b77780 (patch) | |
| tree | 29355722fb8a3e993884e852a254277c80e90de4 /mod/item.php | |
| parent | e193091dfe348c5430c3a303947dbe7a6eced374 (diff) | |
| parent | 622b25df5f2d1ab21c9e23047bc0c98bfe72bad0 (diff) | |
| download | volse-hubzilla-d5a6e7b1767ebc337f31745984f1ce0904b77780.tar.gz volse-hubzilla-d5a6e7b1767ebc337f31745984f1ce0904b77780.tar.bz2 volse-hubzilla-d5a6e7b1767ebc337f31745984f1ce0904b77780.zip | |
Merge remote-tracking branch 'friendica/master'
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 |