public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2026-02-10 16:01:33 +00:00
Code Issues Releases Wiki Activity

Revert "sanitize article content when importing data from feed"

Browse Source 
This reverts commit c7fe1b4e9e.

Conflicts:
	include/functions.php
	include/rssfuncs.php
This commit is contained in:
Andrew Dolgov
2012-10-29 12:17:28 +04:00
parent d372d2bbab
commit b3682750bb
5 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/functions.php
View File

@@ -2686,7 +2686,7 @@
}
function sanitize($link, $str, $owner = false, $site_url = false) {
function sanitize($link, $str, $force_strip_tags = false, $owner = false, $site_url = false) {
if (!$owner) $owner = $_SESSION["uid"];
$res = trim($str); if (!$res) return '';
@@ -3626,6 +3626,13 @@
}
} // function encrypt_password
function sanitize_article_content($text) {
# we don't support CDATA sections in articles, they break our own escaping
$text = preg_replace("/\[\[CDATA/", "", $text);
$text = preg_replace("/\]\]\>/", "", $text);
return db_escape_string($text, false);
}
function load_filters($link, $feed_id, $owner_uid, $action_id = false) {
$filters = array();

4
include/rssfuncs.php
View File

@@ -770,8 +770,8 @@
}
# sanitize content
$entry_content = db_escape_string(sanitize($link, $entry_content, $owner_uid, $site_url));
$entry_title = db_escape_string(strip_tags($entry_title));
$entry_content = sanitize_article_content($entry_content);
$entry_title = sanitize_article_content($entry_title);
if ($debug_enabled) {
_debug("update_rss_feed: done collecting data [TITLE:$entry_title]");