diff options
| author | Michael Vogel <icarus@dabo.de> | 2012-06-23 12:50:00 +0200 |
|---|---|---|
| committer | Michael Vogel <icarus@dabo.de> | 2012-06-23 12:50:00 +0200 |
| commit | a81af2e042ae133bec3097488feeaa1318dc798b (patch) | |
| tree | 25d2103fb3ce9edf45c0f7d1142b5cd3f63f8591 /library/simplepie/simplepie.inc | |
| parent | 7a4ad4564dc4fa49aa860a10949ffe8958305f3a (diff) | |
| parent | bf47bf5ba015a844919362a56903eb82c064bee9 (diff) | |
| download | volse-hubzilla-a81af2e042ae133bec3097488feeaa1318dc798b.tar.gz volse-hubzilla-a81af2e042ae133bec3097488feeaa1318dc798b.tar.bz2 volse-hubzilla-a81af2e042ae133bec3097488feeaa1318dc798b.zip | |
Merge remote branch 'upstream/master'
Conflicts:
include/bb2diaspora.php
Diffstat (limited to 'library/simplepie/simplepie.inc')
| -rw-r--r-- | library/simplepie/simplepie.inc | 6 |
1 files changed, 3 insertions, 3 deletions
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) { |