friendica/friendica
6
0
Fork 1
mirror of https://github.com/friendica/friendica synced 2024-05-17 22:36:43 +02:00
Code Issues Packages Projects Releases 1 Wiki Activity

Better treatment of Oembed detection with no OEmbed data and not title

Browse source
This commit is contained in:
Michael 2018-01-12 23:32:58 +00:00
parent 85eaa002a2
commit 2c90c5be94
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/Content/OEmbed.php
View file

@ -202,23 +202,22 @@ class OEmbed
// add link to source if not present in "rich" type // add link to source if not present in "rich" type
if ($j->type != 'rich' || !strpos($j->html, $embedurl)) { if ($j->type != 'rich' || !strpos($j->html, $embedurl)) {
$ret .= '<h4>'; $ret .= '<h4>';
if (isset($j->title)) { if (!empty($j->title)) {
if (isset($j->provider_name)) { if (!empty($j->provider_name)) {
$ret .= $j->provider_name . ": "; $ret .= $j->provider_name . ": ";
} }
$embedlink = (isset($j->title)) ? $j->title : $embedurl; $ret .= '<a href="' . $embedurl . '" rel="oembed">' . $j->title . '</a>';
$ret .= '<a href="' . $embedurl . '" rel="oembed">' . $embedlink . '</a>'; if (!empty($j->author_name)) {
if (isset($j->author_name)) {
$ret .= ' (' . $j->author_name . ')'; $ret .= ' (' . $j->author_name . ')';
} }
} elseif (isset($j->provider_name) || isset($j->author_name)) { } elseif (!empty($j->provider_name) || !empty($j->author_name)) {
$embedlink = ""; $embedlink = "";
if (isset($j->provider_name)) { if (!empty($j->provider_name)) {
$embedlink .= $j->provider_name; $embedlink .= $j->provider_name;
} }
if (isset($j->author_name)) { if (!empty($j->author_name)) {
if ($embedlink != "") { if ($embedlink != "") {
$embedlink .= ": "; $embedlink .= ": ";
} }
@ -230,6 +229,8 @@ class OEmbed
} }
$ret .= '<a href="' . $embedurl . '" rel="oembed">' . $embedlink . '</a>'; $ret .= '<a href="' . $embedurl . '" rel="oembed">' . $embedlink . '</a>';
} else {
$ret .= '<a href="' . $embedurl . '" rel="oembed">' . $embedurl . '</a>';
} }
$ret .= "</h4>"; $ret .= "</h4>";
} elseif (!strpos($j->html, $embedurl)) { } elseif (!strpos($j->html, $embedurl)) {