summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--functions.php14
-rw-r--r--tt-rss.css4
2 files changed, 8 insertions, 10 deletions
diff --git a/functions.php b/functions.php
index e5f06da37..bc46b7c64 100644
--- a/functions.php
+++ b/functions.php
@@ -2441,20 +2441,18 @@
}
function sanitize_rss($str) {
- $res = "";
+ $res = $str;
$res = preg_replace('/<script.*?>/i',
- "<p class=\"scriptWarn\">", $str);
+ "<p class=\"scriptWarn\">Disabled script: ", $res);
- $res = preg_replace('/<\/script>/i',
- "</p>", $res);
+ $res = preg_replace('/<\/script.*?>/i', "</p>", $res);
+
+ $res = preg_replace('/<embed.*?>/i', "", $res);
$res = preg_replace('/<object.*?>.*?<\/object>/i',
"<p class=\"objectWarn\">(Disabled html object
- - flash or other embedded content)</p>", $str);
-
- $res = preg_replace('/<\/object>/i',
- "</p>", $res);
+ - flash or other embedded content)</p>", $res);
return $res;
}
diff --git a/tt-rss.css b/tt-rss.css
index a8136cb1b..337797e73 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -1160,9 +1160,9 @@ span.debugTS {
display : none;
}
-.scriptWarn:before {
+/*.scriptWarn:before {
content : "Disabled script:";
-}
+}*/
.scriptWarn {
color : white;