From 3a7586e3f7198f0ad72ae5905fc291375caee6ae Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Tue, 15 Nov 2022 09:03:43 -0500 Subject: [PATCH 1/2] Fix wrong user table field name in Repository\Notify - Address https://github.com/friendica/friendica/issues/11993#issuecomment-1314954594 --- src/Navigation/Notifications/Repository/Notify.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Navigation/Notifications/Repository/Notify.php b/src/Navigation/Notifications/Repository/Notify.php index 683725e4ba..3891a6e256 100644 --- a/src/Navigation/Notifications/Repository/Notify.php +++ b/src/Navigation/Notifications/Repository/Notify.php @@ -531,7 +531,7 @@ class Notify extends BaseRepository // Ensure that the important fields are set at any time $fields = ['nickname', 'account_removed', 'account_expired']; $user = Model\User::getById($params['uid'], $fields); - if ($user['account_removed'] || $user['user_expired']) { + if ($user['account_removed'] || $user['account_expired']) { return false; } From 952e6c688c8da470591f2abd25fb78dabc2236a2 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Tue, 15 Nov 2022 09:04:12 -0500 Subject: [PATCH 2/2] Suppress warning when /phots route is used without a nickname - Address https://github.com/friendica/friendica/issues/11993#issuecomment-1314964388 --- mod/photos.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/photos.php b/mod/photos.php index 95627b6da4..3923bdfc89 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -788,7 +788,7 @@ function photos_content(App $a) // photos/name/image/xxxxx/edit // photos/name/image/xxxxx/drop - $user = User::getByNickname(DI::args()->getArgv()[1]); + $user = User::getByNickname(DI::args()->getArgv()[1] ?? ''); if (!DBA::isResult($user)) { throw new HTTPException\NotFoundException(DI::l10n()->t('User not found.')); }