Merge branch 'master' of git.fakecake.org:tt-rss

master
Andrew Dolgov 6 years ago
commit 70d9c7849a

@ -323,8 +323,7 @@ class Handler_Public extends Handler {
foreach ($enclosures as $enc) { foreach ($enclosures as $enc) {
if (strpos($enc["content_type"], "image/") !== FALSE) { if (strpos($enc["content_type"], "image/") !== FALSE) {
$og_image = $enc["content_url"]; return rewrite_relative_url($site_url, $enc["content_url"]);
break;
} }
} }
@ -333,15 +332,18 @@ class Handler_Public extends Handler {
if (@$tmpdoc->loadHTML(mb_substr($content, 0, 131070))) { if (@$tmpdoc->loadHTML(mb_substr($content, 0, 131070))) {
$tmpxpath = new DOMXPath($tmpdoc); $tmpxpath = new DOMXPath($tmpdoc);
$first_img = $tmpxpath->query("//img")->item(0); $imgs = $tmpxpath->query("//img");
foreach ($imgs as $img) {
$src = $img->getAttribute("src");
if ($first_img) { if (mb_strpos($src, "data:") !== 0)
$og_image = $first_img->getAttribute("src"); return rewrite_relative_url($site_url, $src);
} }
} }
} }
return rewrite_relative_url($site_url, $og_image); return false;
} }
private function format_article($id, $owner_uid) { private function format_article($id, $owner_uid) {

Loading…
Cancel
Save