From 9b4bef8ac49131f8138d360805645e2da44913ae Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 1 Apr 2012 06:46:12 -0700 Subject: that didn't quite work out --- include/items.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/items.php') diff --git a/include/items.php b/include/items.php index e09b888ca..8f8b3ccd0 100755 --- a/include/items.php +++ b/include/items.php @@ -435,8 +435,8 @@ function get_atom_elements($feed,$item) { $res['body'] = @html2bbcode($res['body']); } - else - $res['body'] = escape_tags($res['body']); +// else +// $res['body'] = escape_tags($res['body']); $allow = $item->get_item_tags(NAMESPACE_DFRN,'comment-allow'); if($allow && $allow[0]['data'] == 1) -- cgit v1.2.3 From 00bbb9ad362539cc945254eb66af33e2e470440b Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 1 Apr 2012 15:43:57 -0700 Subject: slight improvement in handling of plaintext feeds --- include/items.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'include/items.php') diff --git a/include/items.php b/include/items.php index 8f8b3ccd0..ee6960534 100755 --- a/include/items.php +++ b/include/items.php @@ -435,8 +435,15 @@ function get_atom_elements($feed,$item) { $res['body'] = @html2bbcode($res['body']); } -// else -// $res['body'] = escape_tags($res['body']); + elseif(! $have_real_body) { + + // it's not one of our messages and it has no tags + // so it's probably just text. We'll escape it just to be safe. + + $res['body'] = escape_tags($res['body']); + } + + // this tag is obsolete but we keep it for really old sites $allow = $item->get_item_tags(NAMESPACE_DFRN,'comment-allow'); if($allow && $allow[0]['data'] == 1) -- cgit v1.2.3