Revert "sanitize article content when importing data from feed"

This reverts commit c7fe1b4e9e392e0b9ffa55151c43ea7e2e2ee709.

Conflicts:
	include/functions.php
	include/rssfuncs.php

3 files changed, 7 insertions, 5 deletions

diff --git a/classes/feeds.php b/classes/feeds.php
index d99aea7c6..e6c9e0e37 100644
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -628,8 +628,10 @@ class Feeds extends Handler_Protected {
 						}

 					}

 

-#					$feed_site_url = $line["site_url"];

-					$article_content = $line["content_preview"];

+					$feed_site_url = $line["site_url"];

+

+					$article_content = sanitize($this->link, $line["content_preview"],

+							false, false, $feed_site_url);

 

 					$reply['content'] .= "<div id=\"POSTNOTE-$id\">";

 					if ($line['note']) {

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 = "<div style=\"$note_style\">Article note: " . $line['note'] . "</div>" .
@@ -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'];
diff --git a/classes/rpc.php b/classes/rpc.php
index 56b13dc51..cb3eeda98 100644
--- a/classes/rpc.php
+++ b/classes/rpc.php
@@ -584,7 +584,7 @@ class RPC extends Handler_Protected {
 			FROM ttrss_entries, ttrss_user_entries
 			WHERE id = '$article_id' AND ref_id = id AND owner_uid = ".$_SESSION['uid']);
 
-		$content = db_fetch_result($result, 0, "content");
+		$content = sanitize($this->link, db_fetch_result($result, 0, "content"));
 		$title = strip_tags(db_fetch_result($result, 0, "title"));
 		$article_url = htmlspecialchars(db_fetch_result($result, 0, "link"));
 		$marked = sql_bool_to_bool(db_fetch_result($result, 0, "marked"));