From f0b8d016154e274f5bfe4d3ec5ac3950621cc2ce Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 1 Apr 2012 03:19:37 -0700 Subject: [PATCH] try slightly better detection of html in feeds --- include/items.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/include/items.php b/include/items.php index 9f7eb84d96..e09b888cab 100755 --- a/include/items.php +++ b/include/items.php @@ -416,7 +416,7 @@ function get_atom_elements($feed,$item) { // the wild, by sanitising it and converting supported tags to bbcode before we rip out any remaining // html. - if((strpos($res['body'],'<') !== false) || (strpos($res['body'],'>') !== false)) { + if((strpos($res['body'],'<') !== false) && (strpos($res['body'],'>') !== false)) { $res['body'] = reltoabs($res['body'],$base_url); @@ -429,13 +429,14 @@ function get_atom_elements($feed,$item) { // we shouldn't need a whitelist, because the bbcode converter // will strip out any unsupported tags. - // $config->set('HTML.Allowed', 'p,b,a[href],i'); $purifier = new HTMLPurifier($config); $res['body'] = $purifier->purify($res['body']); - $res['body'] = html2bbcode($res['body']); + $res['body'] = @html2bbcode($res['body']); } + else + $res['body'] = escape_tags($res['body']); $allow = $item->get_item_tags(NAMESPACE_DFRN,'comment-allow'); if($allow && $allow[0]['data'] == 1) -- 2.39.5