aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-04-10 16:31:49 -0700
committerfriendica <info@friendica.com>2012-04-10 16:31:49 -0700
commit9b1bb53234846f8dedbf10f0adf1033593ae26d7 (patch)
treefe454525594386bb5ed786fa8b45ba460c764132
parent703bfcb6d4bd21e68aaabd5f1b256106c505f0e9 (diff)
downloadvolse-hubzilla-9b1bb53234846f8dedbf10f0adf1033593ae26d7.tar.gz
volse-hubzilla-9b1bb53234846f8dedbf10f0adf1033593ae26d7.tar.bz2
volse-hubzilla-9b1bb53234846f8dedbf10f0adf1033593ae26d7.zip
fix_mce_lf on profiles
-rw-r--r--include/text.php5
-rw-r--r--mod/profiles.php21
2 files changed, 16 insertions, 10 deletions
diff --git a/include/text.php b/include/text.php
index aced9e0a8..4ec59a665 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1506,3 +1506,8 @@ function undo_post_tagging($s) {
return $s;
}
+function fix_mce_lf($s) {
+ $s = str_replace("\r\n","\n",$s);
+ $s = str_replace("\n\n","\n",$s);
+ return $s;
+} \ No newline at end of file
diff --git a/mod/profiles.php b/mod/profiles.php
index 7b3b6ccc1..20be43d5d 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -121,16 +121,17 @@ function profiles_post(&$a) {
$politic = notags(trim($_POST['politic']));
$religion = notags(trim($_POST['religion']));
- $about = escape_tags(trim($_POST['about']));
- $interest = escape_tags(trim($_POST['interest']));
- $contact = escape_tags(trim($_POST['contact']));
- $music = escape_tags(trim($_POST['music']));
- $book = escape_tags(trim($_POST['book']));
- $tv = escape_tags(trim($_POST['tv']));
- $film = escape_tags(trim($_POST['film']));
- $romance = escape_tags(trim($_POST['romance']));
- $work = escape_tags(trim($_POST['work']));
- $education = escape_tags(trim($_POST['education']));
+ $about = fix_mce_lf(escape_tags(trim($_POST['about'])));
+ $interest = fix_mce_lf(escape_tags(trim($_POST['interest'])));
+ $contact = fix_mce_lf(escape_tags(trim($_POST['contact'])));
+ $music = fix_mce_lf(escape_tags(trim($_POST['music'])));
+ $book = fix_mce_lf(escape_tags(trim($_POST['book'])));
+ $tv = fix_mce_lf(escape_tags(trim($_POST['tv'])));
+ $film = fix_mce_lf(escape_tags(trim($_POST['film'])));
+ $romance = fix_mce_lf(escape_tags(trim($_POST['romance'])));
+ $work = fix_mce_lf(escape_tags(trim($_POST['work'])));
+ $education = fix_mce_lf(escape_tags(trim($_POST['education'])));
+
$hide_friends = (($_POST['hide-friends'] == 1) ? 1: 0);
$r = q("UPDATE `profile`