aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-06-20 05:04:51 -0700
committerfriendica <info@friendica.com>2012-06-20 05:04:51 -0700
commitf0db196288e60c0165810edea009711dcbbdb218 (patch)
treed0544ae448742be0cdc23e2068c2c5e72763b37c
parentb3bf48782fc9cc768645b3e08543799ccc1c743b (diff)
downloadvolse-hubzilla-f0db196288e60c0165810edea009711dcbbdb218.tar.gz
volse-hubzilla-f0db196288e60c0165810edea009711dcbbdb218.tar.bz2
volse-hubzilla-f0db196288e60c0165810edea009711dcbbdb218.zip
iframes were getting stripped at the rss/atom parser level. We can preserve these because we will strip them in the purifier after checking for supported video sources
-rwxr-xr-xinclude/items.php2
-rw-r--r--library/simplepie/simplepie.inc6
2 files changed, 5 insertions, 3 deletions
diff --git a/include/items.php b/include/items.php
index 73812978a..d679efd90 100755
--- a/include/items.php
+++ b/include/items.php
@@ -446,6 +446,8 @@ function get_atom_elements($feed,$item) {
$res['body'] = $purifier->purify($res['body']);
$res['body'] = @html2bbcode($res['body']);
+
+
}
elseif(! $have_real_body) {
diff --git a/library/simplepie/simplepie.inc b/library/simplepie/simplepie.inc
index 8a2739f52..96ad06678 100644
--- a/library/simplepie/simplepie.inc
+++ b/library/simplepie/simplepie.inc
@@ -709,7 +709,7 @@ class SimplePie
* @see SimplePie::strip_htmltags()
* @access private
*/
- var $strip_htmltags = array('base', 'blink', 'body', 'doctype', 'embed', 'font', 'form', 'frame', 'frameset', 'html', 'iframe', 'input', 'marquee', 'meta', 'noscript', 'object', 'param', 'script', 'style');
+ var $strip_htmltags = array('base', 'blink', 'body', 'doctype', 'embed', 'font', 'form', 'frame', 'frameset', 'html', 'input', 'marquee', 'meta', 'noscript', 'object', 'param', 'script', 'style');
/**
* The SimplePie class contains feed level data and options
@@ -14803,7 +14803,7 @@ class SimplePie_Sanitize
// Options
var $remove_div = true;
var $image_handler = '';
- var $strip_htmltags = array('base', 'blink', 'body', 'doctype', 'embed', 'font', 'form', 'frame', 'frameset', 'html', 'iframe', 'input', 'marquee', 'meta', 'noscript', 'object', 'param', 'script', 'style');
+ var $strip_htmltags = array('base', 'blink', 'body', 'doctype', 'embed', 'font', 'form', 'frame', 'frameset', 'html', 'input', 'marquee', 'meta', 'noscript', 'object', 'param', 'script', 'style');
var $encode_instead_of_strip = false;
var $strip_attributes = array('bgsound', 'class', 'expr', 'id', 'style', 'onclick', 'onerror', 'onfinish', 'onmouseover', 'onmouseout', 'onfocus', 'onblur', 'lowsrc', 'dynsrc');
var $strip_comments = false;
@@ -14892,7 +14892,7 @@ class SimplePie_Sanitize
}
}
- function strip_htmltags($tags = array('base', 'blink', 'body', 'doctype', 'embed', 'font', 'form', 'frame', 'frameset', 'html', 'iframe', 'input', 'marquee', 'meta', 'noscript', 'object', 'param', 'script', 'style'))
+ function strip_htmltags($tags = array('base', 'blink', 'body', 'doctype', 'embed', 'font', 'form', 'frame', 'frameset', 'html', 'input', 'marquee', 'meta', 'noscript', 'object', 'param', 'script', 'style'))
{
if ($tags)
{