Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-05-01 09:04:24 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '2021.03-rc' into copyright-2021

Browse source
This commit is contained in:
Balázs Úr 2021-03-29 08:45:21 +02:00 • committed by GitHub
commit befc2af504
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 41829 additions and 40547 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/Util/ParseUrl.php
View file

@ -512,7 +512,6 @@ class ParseUrl
{
if (!empty($siteinfo['images'])) {
array_walk($siteinfo['images'], function (&$image) use ($page_url) {
$image = [];
// According to the specifications someone could place a picture url into the content field as well.
// But this doesn't seem to happen in the wild, so we don't cover it here.
if (!empty($image['url'])) {
@ -525,7 +524,11 @@ class ParseUrl
$image['contenttype'] = $photodata['mime'];
unset($image['url']);
ksort($image);
} else {
$image = [];
}
} else {
$image = [];
}
});
@ -711,7 +714,7 @@ class ParseUrl
array_walk_recursive($siteinfo, function (&$element) {
if (is_string($element)) {
$element = html_entity_decode($element, ENT_COMPAT, 'UTF-8');
$element = trim(strip_tags(html_entity_decode($element, ENT_COMPAT, 'UTF-8')));
}
});