Issue 11470: Check for removed account

diff --git a/mod/photos.php b/mod/photos.php
index 52d749bb46f841f3f37e93fc91d76506ba261dd5..1374b8543293840f5f8137056ffa0d7d733400a0 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -65,7 +65,7 @@ function photos_init(App $a) {
 
        if (DI::args()->getArgc() > 1) {
                $owner = User::getOwnerDataByNick(DI::args()->getArgv()[1]);
-               if (!$owner) {
+               if (empty($owner) || $owner['account_removed']) {
                        throw new HTTPException\NotFoundException(DI::l10n()->t('User not found.'));
                }
 

diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index 5fbfc4ba5abe06881ab564dc189905cae582f37b..46c5b542423f401848880d173ac11b952426b112 100644 (file)
--- a/src/Model/Profile.php
+++ b/src/Model/Profile.php
@@ -220,7 +220,7 @@ class Profile
        public static function load(App $a, string $nickname, bool $show_contacts = true)
        {
                $profile = User::getOwnerDataByNick($nickname);
-               if (empty($profile)) {
+               if (empty($profile) || $profile['account_removed']) {
                        Logger::info('profile error: ' . DI::args()->getQueryString());
                        return [];
                }

diff --git a/src/Module/Profile/Profile.php b/src/Module/Profile/Profile.php
index 199b96e2c976e4f10b8ff69b5f5e42da1583e310..ccc3208b60bc3b02561ec97887115ef129214b3b 100644 (file)
--- a/src/Module/Profile/Profile.php
+++ b/src/Module/Profile/Profile.php
@@ -49,7 +49,7 @@ class Profile extends BaseProfile
        protected function rawContent(array $request = [])
        {
                if (ActivityPub::isRequest()) {
-                       $user = DBA::selectFirst('user', ['uid'], ['nickname' => $this->parameters['nickname']]);
+                       $user = DBA::selectFirst('user', ['uid'], ['nickname' => $this->parameters['nickname'], 'account_removed' => false]);
                        if (DBA::isResult($user)) {
                                try {
                                        $data = ActivityPub\Transmitter::getProfile($user['uid']);