Fix fatal execution path for found Network::get() parameter execption
This commit is contained in:
parent
c51128ad20
commit
1998b7811b
|
@ -3639,7 +3639,7 @@ class Item
|
|||
*
|
||||
* @return integer item id
|
||||
*/
|
||||
public static function fetchByLink($uri, $uid = 0)
|
||||
public static function fetchByLink(string $uri, int $uid = 0)
|
||||
{
|
||||
$item_id = self::searchByLink($uri, $uid);
|
||||
if (!empty($item_id)) {
|
||||
|
@ -3692,7 +3692,7 @@ class Item
|
|||
*
|
||||
* @return array item array with data from the original item
|
||||
*/
|
||||
public static function addShareDataFromOriginal($item)
|
||||
public static function addShareDataFromOriginal(array $item)
|
||||
{
|
||||
$shared = self::getShareArray($item);
|
||||
if (empty($shared)) {
|
||||
|
@ -3714,9 +3714,9 @@ class Item
|
|||
}
|
||||
|
||||
// Otherwhise try to find (and possibly fetch) the item via the link. This should work for Diaspora and ActivityPub posts
|
||||
$id = self::fetchByLink($shared['link'], $uid);
|
||||
$id = self::fetchByLink($shared['link'] ?? '', $uid);
|
||||
if (empty($id)) {
|
||||
Logger::info('Original item not found', ['url' => $shared['link'], 'callstack' => System::callstack()]);
|
||||
Logger::info('Original item not found', ['url' => $shared['link'] ?? '', 'callstack' => System::callstack()]);
|
||||
return $item;
|
||||
}
|
||||
|
||||
|
|
|
@ -87,7 +87,7 @@ class ActivityPub
|
|||
* @return array
|
||||
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
|
||||
*/
|
||||
public static function fetchContent($url, $uid = 0)
|
||||
public static function fetchContent(string $url, int $uid = 0)
|
||||
{
|
||||
if (!empty($uid)) {
|
||||
return HTTPSignature::fetch($url, $uid);
|
||||
|
|
|
@ -681,7 +681,7 @@ class Processor
|
|||
* @return string fetched message URL
|
||||
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
|
||||
*/
|
||||
public static function fetchMissingActivity($url, $child = [])
|
||||
public static function fetchMissingActivity(string $url, array $child = [])
|
||||
{
|
||||
if (!empty($child['receiver'])) {
|
||||
$uid = ActivityPub\Receiver::getFirstUserFromReceivers($child['receiver']);
|
||||
|
|
Loading…
Reference in New Issue
Block a user