aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-04-10 17:14:07 -0700
committerfriendica <info@friendica.com>2012-04-10 17:14:07 -0700
commit18e225b05167261429df0e8dc4e6acf5cefd6c2a (patch)
tree33c68f16699b1c4318a15eb7488dcd0efbf55b80
parentab46f95683cd12edb7cc80b003f1806b12135c10 (diff)
downloadvolse-hubzilla-18e225b05167261429df0e8dc4e6acf5cefd6c2a.tar.gz
volse-hubzilla-18e225b05167261429df0e8dc4e6acf5cefd6c2a.tar.bz2
volse-hubzilla-18e225b05167261429df0e8dc4e6acf5cefd6c2a.zip
move all fix_mce to one function so it can easily be undone
-rw-r--r--mod/item.php3
-rw-r--r--mod/message.php3
2 files changed, 2 insertions, 4 deletions
diff --git a/mod/item.php b/mod/item.php
index c30b17457..7f0ca3fc3 100644
--- 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);
}
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);