diff options
| author | Andrew Dolgov <[email protected]> | 2011-12-13 16:08:08 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2011-12-13 16:08:08 +0400 |
| commit | 183ff16c7cc7ed51c10158d8f987a82bedf15bf6 (patch) | |
| tree | 6b5f3f92051d3f7a1a1009857ca38916c21bb164 | |
| parent | 2c08214a7f4dd693cb401714412b7a1ad635ed41 (diff) | |
rename sanitize_rss to sanitize
| -rw-r--r-- | classes/rpc.php | 4 | ||||
| -rw-r--r-- | include/functions.php | 8 | ||||
| -rw-r--r-- | mobile/mobile-functions.php | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/classes/rpc.php b/classes/rpc.php index c6fc8c263..c553b9b90 100644 --- a/classes/rpc.php +++ b/classes/rpc.php @@ -507,7 +507,7 @@ class RPC extends Protected_Handler { FROM ttrss_entries, ttrss_user_entries WHERE id = '$article_id' AND ref_id = id AND owner_uid = ".$_SESSION['uid']); - $content = sanitize_rss($this->link, 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")); @@ -706,7 +706,7 @@ class RPC extends Protected_Handler { if (db_num_rows($result) != 0) { $line = db_fetch_assoc($result); - $article_content = sanitize_rss($this->link, $line["content"], + $article_content = sanitize($this->link, $line["content"], false, false, $line['site_url']); array_push($rv, diff --git a/include/functions.php b/include/functions.php index 2246e6bf3..ef34b3d20 100644 --- a/include/functions.php +++ b/include/functions.php @@ -2577,7 +2577,7 @@ $tpl->setVariable('ARTICLE_EXCERPT', truncate_string(strip_tags($line["content_preview"]), 100, '...')); - $content = sanitize_rss($link, $line["content_preview"], false, $owner_uid); + $content = sanitize($link, $line["content_preview"], false, $owner_uid); if ($line['note']) { $content = "<div style=\"$note_style\">Article note: " . $line['note'] . "</div>" . @@ -2640,7 +2640,7 @@ } } - function sanitize_rss($link, $str, $force_strip_tags = false, $owner = false, $site_url = false) { + function sanitize($link, $str, $force_strip_tags = false, $owner = false, $site_url = false) { global $purifier; if (!$owner) $owner = $_SESSION["uid"]; @@ -3749,7 +3749,7 @@ $rv['content'] .= "<div class=\"postContent\">"; - $article_content = sanitize_rss($link, $line["content"], false, false, + $article_content = sanitize($link, $line["content"], false, false, $feed_site_url); $rv['content'] .= $article_content; @@ -4245,7 +4245,7 @@ $feed_site_url = $line["site_url"]; - $article_content = sanitize_rss($link, $line["content_preview"], + $article_content = sanitize($link, $line["content_preview"], false, false, $feed_site_url); $reply['content'] .= "<div id=\"POSTNOTE-$id\">"; diff --git a/mobile/mobile-functions.php b/mobile/mobile-functions.php index 1765a65eb..be59fb7aa 100644 --- a/mobile/mobile-functions.php +++ b/mobile/mobile-functions.php @@ -506,7 +506,7 @@ // print "</fieldset>"; - $content = sanitize_rss($link, $line["content"]); + $content = sanitize($link, $line["content"]); $content = preg_replace("/href=/i", "target=\"_blank\" href=", $content); if (!mobile_get_pref($link, "SHOW_IMAGES")) { |