Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-23 00:40:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix more errors

Browse source
This commit is contained in:
Art4 2024-11-17 22:26:43 +00:00
parent 08ecf2c9a4
commit 12ed714a9e
5 changed files with 13 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Module/Security/TwoFactor/Trust.php
View file

@ -94,7 +94,7 @@ class Trust extends BaseModule
// exception wanted! // exception wanted!
throw $e; throw $e;
} catch (\Exception $e) { } catch (\Exception $e) {
$this->logger->warning('Unexpected error during authentication.', ['user' => $this->session->getLocalUserId(), 'exception' => $exception]); $this->logger->warning('Unexpected error during authentication.', ['user' => $this->session->getLocalUserId(), 'exception' => $e]);
} }
} }
} }

6
src/Module/Settings/Profile/Photo/Crop.php
View file

@ -46,9 +46,6 @@ class Crop extends BaseSettings
$base_image = Photo::selectFirst([], ['resource-id' => $resource_id, 'uid' => DI::userSession()->getLocalUserId(), 'scale' => $scale]); $base_image = Photo::selectFirst([], ['resource-id' => $resource_id, 'uid' => DI::userSession()->getLocalUserId(), 'scale' => $scale]);
if (DBA::isResult($base_image)) { if (DBA::isResult($base_image)) {
$Image = Photo::getImageForPhoto($base_image); $Image = Photo::getImageForPhoto($base_image);
if (empty($Image)) {
throw new HTTPException\InternalServerErrorException();
}
if ($Image->isValid()) { if ($Image->isValid()) {
// If setting for the default profile, unset the profile photo flag from any other photos I own // If setting for the default profile, unset the profile photo flag from any other photos I own
@ -185,9 +182,6 @@ class Crop extends BaseSettings
} }
$Image = Photo::getImageForPhoto($photos[0]); $Image = Photo::getImageForPhoto($photos[0]);
if (empty($Image)) {
throw new HTTPException\InternalServerErrorException();
}
$imagecrop = [ $imagecrop = [
'resource-id' => $resource_id, 'resource-id' => $resource_id,

4
src/Module/Xrd.php
View file

@ -64,6 +64,8 @@ class Xrd extends BaseModule
header('Vary: Accept', false); header('Vary: Accept', false);
$alias = '';
if ($name == User::getActorName()) { if ($name == User::getActorName()) {
$owner = User::getSystemAccount(); $owner = User::getSystemAccount();
if (empty($owner)) { if (empty($owner)) {
@ -108,7 +110,7 @@ class Xrd extends BaseModule
$parts[] = current(explode(';', $part)); $parts[] = current(explode(';', $part));
} }
if (empty($parts)) { if ($parts === []) {
return $default; return $default;
} elseif (in_array('application/jrd+json', $parts) && !in_array('application/xrd+xml', $parts)) { } elseif (in_array('application/jrd+json', $parts) && !in_array('application/xrd+xml', $parts)) {
return Response::TYPE_JSON; return Response::TYPE_JSON;

16
src/Navigation/Notifications/ValueObject/FormattedNotify.php
View file

@ -41,13 +41,13 @@ class FormattedNotify extends BaseDataTransferObject
public function __construct(string $label, string $link, string $image, string $url, string $text, string $when, string $ago, bool $seen) public function __construct(string $label, string $link, string $image, string $url, string $text, string $when, string $ago, bool $seen)
{ {
$this->label = $label ?? ''; $this->label = $label;
$this->link = $link ?? ''; $this->link = $link;
$this->image = $image ?? ''; $this->image = $image;
$this->url = $url ?? ''; $this->url = $url;
$this->text = $text ?? ''; $this->text = $text;
$this->when = $when ?? ''; $this->when = $when;
$this->ago = $ago ?? ''; $this->ago = $ago;
$this->seen = $seen ?? false; $this->seen = $seen;
} }
} }

2
view/theme/frio/config.php
View file

@ -92,7 +92,7 @@ function theme_admin_post()
} }
} }
function theme_content(): string function theme_content(App $a): string
{ {
if (!DI::userSession()->getLocalUserId()) { if (!DI::userSession()->getLocalUserId()) {
return ''; return '';