keith
/
friendica
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #12747 from MrPetovan/bug/warnings 

Address a couple of warnings
This commit is contained in:
Philipp 2023-01-29 08:21:46 +01:00 committed by GitHub
parent 450c753004 48a7958ef9
commit df021b07e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Factory/Api/Mastodon/Status.php
View File

@ -285,8 +285,7 @@ class Status extends BaseFactory
{
if (empty($item['quote-uri-id'])) {
$media = Post\Media::getByURIId($item['uri-id'], [Post\Media::ACTIVITY]);
if (!empty($media)) {
$shared_item = Post::selectFirst(['uri-id'], ['plink' => $media[0]['url'], 'uid' => [$uid, 0]]);
if (!empty($media) && $shared_item = Post::selectFirst(['uri-id'], ['plink' => $media[0]['url'], 'uid' => [$uid, 0]])) {
$quote_id = $shared_item['uri-id'];
}
} else {

2
src/Module/Photo.php
View File

@ -351,7 +351,7 @@ class Photo extends BaseModule
}
// If it is a local link, we save resources by just redirecting to it.
if (Network::isLocalLink($url)) {
if (!empty($url) && Network::isLocalLink($url)) {
System::externalRedirect($url);
}