diff options
| author | jeroenpraat <jeroenpraat@xs4all.nl> | 2016-08-31 13:17:34 +0200 |
|---|---|---|
| committer | jeroenpraat <jeroenpraat@xs4all.nl> | 2016-08-31 13:17:34 +0200 |
| commit | 38ea71c6c987d54c4029b14043cd6b13bd71f4b1 (patch) | |
| tree | 50ee7e93df6aaae56fa8926de1e854cf8e44c128 /include/oembed.php | |
| parent | 37ad734cead89df63edd75a4c3c3a4fb5b4847bc (diff) | |
| parent | e9462ba14529b7172ba5a21e7985d24de91faa37 (diff) | |
| download | volse-hubzilla-38ea71c6c987d54c4029b14043cd6b13bd71f4b1.tar.gz volse-hubzilla-38ea71c6c987d54c4029b14043cd6b13bd71f4b1.tar.bz2 volse-hubzilla-38ea71c6c987d54c4029b14043cd6b13bd71f4b1.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
Diffstat (limited to 'include/oembed.php')
| -rwxr-xr-x | include/oembed.php | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/include/oembed.php b/include/oembed.php index fe6f10d71..085637a00 100755 --- a/include/oembed.php +++ b/include/oembed.php @@ -156,9 +156,12 @@ function oembed_fetch_url($embedurl){ if ($action !== 'block') { // try oembed autodiscovery $redirects = 0; - $result = z_fetch_url($furl, false, $redirects, array('timeout' => 15, 'accept_content' => "text/*", 'novalidate' => true )); + $result = z_fetch_url($furl, false, $redirects, array('timeout' => 30, 'accept_content' => "text/*", 'novalidate' => true )); + if($result['success']) $html_text = $result['body']; + else + logger('fetch failure: ' . $furl); if($html_text) { $dom = @DOMDocument::loadHTML($html_text); @@ -171,7 +174,10 @@ function oembed_fetch_url($embedurl){ foreach($entries as $e){ $href = $e->getAttributeNode("href")->nodeValue; $x = z_fetch_url($href . '&maxwidth=' . App::$videowidth); - $txt = $x['body']; + if($x['success']) + $txt = $x['body']; + else + logger('fetch failed: ' . $href); break; } // soundcloud is now using text/json+oembed instead of application/json+oembed, @@ -180,7 +186,10 @@ function oembed_fetch_url($embedurl){ foreach($entries as $e){ $href = $e->getAttributeNode("href")->nodeValue; $x = z_fetch_url($href . '&maxwidth=' . App::$videowidth); - $txt = $x['body']; + if($x['success']) + $txt = $x['body']; + else + logger('json fetch failed: ' . $href); break; } } |