From b3682750bb59382681dafda3776e9e100e39d4e2 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 29 Oct 2012 12:17:28 +0400 Subject: Revert "sanitize article content when importing data from feed" This reverts commit c7fe1b4e9e392e0b9ffa55151c43ea7e2e2ee709. Conflicts: include/functions.php include/rssfuncs.php --- classes/handler/public.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'classes/handler') diff --git a/classes/handler/public.php b/classes/handler/public.php index 0aa86a844..d3c3fc094 100644 --- a/classes/handler/public.php +++ b/classes/handler/public.php @@ -61,7 +61,7 @@ class Handler_Public extends Handler { $tpl->setVariable('ARTICLE_EXCERPT', truncate_string(strip_tags($line["content_preview"]), 100, '...'), true); - $content = $line["content_preview"]; + $content = sanitize($this->link, $line["content_preview"], false, $owner_uid); if ($line['note']) { $content = "
Article note: " . $line['note'] . "
" . @@ -132,7 +132,7 @@ class Handler_Public extends Handler { $article['link'] = $line['link']; $article['title'] = $line['title']; $article['excerpt'] = truncate_string(strip_tags($line["content_preview"]), 100, '...'); - $article['content'] = $line["content_preview"]; + $article['content'] = sanitize($this->link, $line["content_preview"], false, $owner_uid); $article['updated'] = date('c', strtotime($line["updated"])); if ($line['note']) $article['note'] = $line['note']; -- cgit v1.2.3