bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Merge pull request #12642 from MrPetovan/bug/fatal-errors

Browse source 
Address a few Fatal Errors
This commit is contained in:
Philipp 2023-01-09 23:14:05 +01:00 committed by GitHub
commit 4eea80bdd9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Core/System.php
View file

@ -253,12 +253,12 @@ class System
$func['database'] = in_array($func['class'], ['Friendica\Database\DBA', 'Friendica\Database\Database']); $func['database'] = in_array($func['class'], ['Friendica\Database\DBA', 'Friendica\Database\Database']);
if (!$previous['database'] || !$func['database']) { if (!$previous['database'] || !$func['database']) {
$classparts = explode("\\", $func['class']); $classparts = explode("\\", $func['class']);
$callstack[] = array_pop($classparts).'::'.$func['function']; $callstack[] = array_pop($classparts).'::'.$func['function'] . '(' . $func['line'] . ')';
$previous = $func; $previous = $func;
} }
} elseif (!in_array($func['function'], $ignore)) { } elseif (!in_array($func['function'], $ignore)) {
$func['database'] = ($func['function'] == 'q'); $func['database'] = ($func['function'] == 'q');
$callstack[] = $func['function']; $callstack[] = $func['function'] . '(' . $func['line'] . ')';
$func['class'] = ''; $func['class'] = '';
$previous = $func; $previous = $func;
} }

10
src/Model/ItemURI.php
View file

@ -81,4 +81,14 @@ class ItemURI
return $itemuri['id'] ?? 0; return $itemuri['id'] ?? 0;
} }
/**
* @param int $uriId
* @return bool
* @throws \Exception
*/
public static function exists(int $uriId): bool
{
return DBA::exists('item-uri', ['id' => $uriId]);
}
} }

6
src/Model/Post/Media.php
View file

@ -30,6 +30,7 @@ use Friendica\Database\DBA;
use Friendica\DI; use Friendica\DI;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Model\Item; use Friendica\Model\Item;
use Friendica\Model\ItemURI;
use Friendica\Model\Photo; use Friendica\Model\Photo;
use Friendica\Model\Post; use Friendica\Model\Post;
use Friendica\Network\HTTPClient\Client\HttpClientAccept; use Friendica\Network\HTTPClient\Client\HttpClientAccept;
@ -89,6 +90,11 @@ class Media
return; return;
} }
if (!ItemURI::exists($media['uri-id'])) {
Logger::info('Media referenced URI ID not found', ['uri-id' => $media['uri-id'], 'url' => $media['url'], 'callstack' => System::callstack()]);
return;
}
$media = self::unsetEmptyFields($media); $media = self::unsetEmptyFields($media);
$media = DI::dbaDefinition()->truncateFieldsForTable('post-media', $media); $media = DI::dbaDefinition()->truncateFieldsForTable('post-media', $media);

2
src/Model/Tag.php
View file

@ -119,7 +119,7 @@ class Tag
$tag = DBA::selectFirst('tag', ['name', 'type'], ['url' => $url]); $tag = DBA::selectFirst('tag', ['name', 'type'], ['url' => $url]);
if (!empty($tag)) { if (!empty($tag)) {
if ($tag['name'] != substr($name, 0, 96)) { if ($tag['name'] != substr($name, 0, 96)) {
DBA::update('tag', ['name' => substr($name, 0, 96)], ['url' => $url]); DBA::update('tag', ['name' => substr($name, 0, 96)], ['url' => $url, 'type' => $tag['type']]);
} }
if (!empty($target) && ($tag['type'] != $target)) { if (!empty($target) && ($tag['type'] != $target)) {
DBA::update('tag', ['type' => $target], ['url' => $url]); DBA::update('tag', ['type' => $target], ['url' => $url]);

2
src/Object/Image.php
View file

@ -196,7 +196,7 @@ class Image
public function isValid(): bool public function isValid(): bool
{ {
if ($this->isImagick()) { if ($this->isImagick()) {
return ($this->image !== false); return !empty($this->image);
} }
return $this->valid; return $this->valid;
} }