friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #5763 from MrPetovan/task/improve-getsiteinfo 

Use OEmbed data when available no matter the type
This commit is contained in:
Michael Vogel 2018-09-17 06:40:04 +00:00 committed by GitHub
parent c4ea3bfb3e 102adf86ae
commit e68c48e88f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Util/ParseUrl.php
View File

@ -161,7 +161,8 @@ class ParseUrl
$siteinfo['type'] = $oembed_data->type;
}
if (($oembed_data->type == 'link') && ($siteinfo['type'] != 'photo')) {
// See https://github.com/friendica/friendica/pull/5763#discussion_r217913178
if ($siteinfo['type'] != 'photo') {
if (isset($oembed_data->title)) {
$siteinfo['title'] = trim($oembed_data->title);
}
@ -337,7 +338,7 @@ class ParseUrl
$siteinfo['type'] = 'link';
}
if ((@$siteinfo['image'] == '') && !$no_guessing) {
if (empty($siteinfo['image']) && !$no_guessing) {
$list = $xpath->query('//img[@src]');
foreach ($list as $node) {
$img_tag = [];