Merge pull request #9243 from annando/preview-text

Only display redundant preview data with preview picture
This commit is contained in:
Hypolite Petovan 2020-09-19 15:42:40 -04:00 committed by GitHub
commit b9a61e5bfb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -134,14 +134,6 @@ class PageInfo
$text = "[attachment type='" . $data['type'] . "'"; $text = "[attachment type='" . $data['type'] . "'";
if (empty($data['text'])) {
$data['text'] = $data['title'];
}
if (empty($data['text'])) {
$data['text'] = $data['url'];
}
if (!empty($data['url'])) { if (!empty($data['url'])) {
$text .= " url='" . $data['url'] . "'"; $text .= " url='" . $data['url'] . "'";
} }
@ -160,6 +152,14 @@ class PageInfo
$text .= " image='" . $preview . "'"; $text .= " image='" . $preview . "'";
} else { } else {
$text .= " preview='" . $preview . "'"; $text .= " preview='" . $preview . "'";
if (empty($data['text'])) {
$data['text'] = $data['title'];
}
if (empty($data['text'])) {
$data['text'] = $data['url'];
}
} }
} }