rename sanitize_rss to sanitize

diff --git a/classes/rpc.php b/classes/rpc.php
index c6fc8c26321e137ff66fbe6978476842fcc469bf..c553b9b90bd01c58fe272a952dd35df0c9db1166 100644 (file)
--- 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 2246e6bf3cf5572847185ff19e004f101f4370cb..ef34b3d20d4db7189ca39618e7a710b56400d697 100644 (file)
--- 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 1765a65eb829e147691555e690aad1f1b5c4a2a5..be59fb7aaa3dd6602c6b8d604a9a81d58d5864ac 100644 (file)
--- 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")) {