diff options
| author | Klaus Weidenbach <Klaus.Weidenbach@gmx.net> | 2017-04-15 13:46:13 +0200 |
|---|---|---|
| committer | Klaus Weidenbach <Klaus.Weidenbach@gmx.net> | 2017-04-15 15:20:14 +0200 |
| commit | 7d5e7bf6c86997d875e645ca59004d021d982658 (patch) | |
| tree | 589554f223a1bb17ff5dd2f3792d85e6f715796d | |
| parent | b6459e617289f729da1372b40f5a35940943f36d (diff) | |
| download | volse-hubzilla-7d5e7bf6c86997d875e645ca59004d021d982658.tar.gz volse-hubzilla-7d5e7bf6c86997d875e645ca59004d021d982658.tar.bz2 volse-hubzilla-7d5e7bf6c86997d875e645ca59004d021d982658.zip | |
We do not parse the body in discover_by_url(), so no need to preserve iframes in SimplePie.
| -rw-r--r-- | include/network.php | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/include/network.php b/include/network.php index 2d47c5b92..c03ca70f5 100644 --- a/include/network.php +++ b/include/network.php @@ -1049,7 +1049,6 @@ function email_send($addr, $subject, $headers, $item) { * @return boolean */ function discover_by_url($url, $arr = null) { - require_once('library/HTML5/Parser.php'); $x = scrape_feed($url); if(! $x) { @@ -1092,12 +1091,6 @@ function discover_by_url($url, $arr = null) { // Don't try and parse an empty string $feed->set_raw_data(($xml) ? $xml : '<?xml version="1.0" encoding="utf-8" ?><xml></xml>'); - // We can preserve iframes because we will strip them in the purifier after - // checking for supported video sources. - $strip_htmltags = $feed->strip_htmltags; - array_splice($strip_htmltags, array_search('iframe', $strip_htmltags), 1); - $feed->strip_htmltags($strip_htmltags); - $feed->init(); if($feed->error()) logger('scrape_feed: Error parsing XML: ' . $feed->error()); @@ -1856,6 +1849,7 @@ function scrape_vcard($url) { * @return array */ function scrape_feed($url) { + require_once('library/HTML5/Parser.php'); $ret = array(); $level = 0; |