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

Picture posts do work again - everything else should work as well

This commit is contained in:
Michael 2018-09-06 20:30:16 +00:00
parent 04fb885857
commit 1d4a5402ff
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Content/Text/BBCode.php
View File

@ -572,17 +572,17 @@ class BBCode extends BaseObject
$return = sprintf('<div class="type-%s">', $data["type"]);
}
if (!empty($data["image"])) {
$return .= sprintf('<a href="%s" target="_blank"><img src="%s" alt="" title="%s" class="attachment-image" /></a><br />', $data["url"], self::proxyUrl($data["image"], $simplehtml), $data["title"]);
} elseif (!empty($data["preview"])) {
$return .= sprintf('<a href="%s" target="_blank"><img src="%s" alt="" title="%s" class="attachment-preview" /></a><br />', $data["url"], self::proxyUrl($data["preview"], $simplehtml), $data["title"]);
}
// Show a picture only when the BBCode is meant for posts to connector networks
if (($simplehtml != 0) && ($data["type"] == "photo") && !empty($data["url"]) && !empty($data["image"])) {
$return .= sprintf('<a href="%s" target="_blank"><img src="%s" alt="" title="%s" class="attachment-image" /></a>', $data["url"], self::proxyUrl($data["image"], $simplehtml), $data["title"]);
} elseif (!empty($data['title']) && !empty($data['url'])) {
$return .= sprintf('<h4><a href="%s">%s</a></h4>', $data['url'], $data['title']);
if (!empty($data['title']) && !empty($data['url'])) {
if (!empty($data["image"]) && empty($data["text"]) && ($data["type"] == "photo")) {
$return .= sprintf('<a href="%s" target="_blank"><img src="%s" alt="" title="%s" class="attachment-image" /></a>', $data["url"], self::proxyUrl($data["image"], $simplehtml), $data["title"]);
} else {
if (!empty($data["image"])) {
$return .= sprintf('<a href="%s" target="_blank"><img src="%s" alt="" title="%s" class="attachment-image" /></a><br />', $data["url"], self::proxyUrl($data["image"], $simplehtml), $data["title"]);
} elseif (!empty($data["preview"])) {
$return .= sprintf('<a href="%s" target="_blank"><img src="%s" alt="" title="%s" class="attachment-preview" /></a><br />', $data["url"], self::proxyUrl($data["preview"], $simplehtml), $data["title"]);
}
$return .= sprintf('<h4><a href="%s">%s</a></h4>', $data['url'], $data['title']);
}
}
if (!empty($data["description"]) && $data["description"] != $data["title"]) {

9
src/Util/ParseUrl.php
View File

@ -271,11 +271,9 @@ class ParseUrl
$siteinfo['image'] = $meta_tag['content'];
break;
case 'twitter:card':
// Convert Twitter types in our own
// Detect photo pages
if ($meta_tag['content'] == 'summary_large_image') {
$siteinfo['type'] = 'photo';
} else {
$siteinfo['type'] = $meta_tag['content'];
}
break;
case 'twitter:description':
@ -334,6 +332,11 @@ class ParseUrl
}
}
// Prevent to have a photo type without an image
if (empty($siteinfo['image']) && (siteinfo['type'] == 'photo')) {
$siteinfo['type'] = 'link';
}
if ((@$siteinfo['image'] == '') && !$no_guessing) {
$list = $xpath->query('//img[@src]');
foreach ($list as $node) {