修正
諏訪子 <suwako@076.moe>、2025-12-29 18:16
コミット d37c49a15d05d205af5f8453a921d3a695a5b50a
・親 6a4ff9d
・ファイルを見る
1個のファイル、+2 -5
| @@ -4,9 +4,6 @@ | ||
| 4 | 4 | class Auth { |
| 5 | 5 | private int $id; |
| 6 | 6 | |
| 7 | - /** | |
| 8 | - * 性別: -1 = 不明, 0 = 男性, 1 = 女性 | |
| 9 | - */ | |
| 10 | 7 | private \stdClass $user; |
| 11 | 8 | private \stdClass $pubUser; |
| 12 | 9 | private ?string $token; |
| @@ -39,7 +36,7 @@ | ||
| 39 | 36 | unset($user->password); |
| 40 | 37 | unset($user->tokens); |
| 41 | 38 | $myself = $this->getUserData(); |
| 42 | - if ($myself->id != $user->id && $myself->role < \Roles::STAFF) $user->email = '(秘密)'; | |
| 39 | + if (!$myself || ($myself->id != $user->id && $myself->role < \Roles::STAFF)) $user->email = '(秘密)'; | |
| 43 | 40 | $user->name = namecolor($user); |
| 44 | 41 | $user->regDate = date('Y年m月d日', $user->regDate); |
| 45 | 42 | $user->gender = $user->gender === \Gender::MALE ? '男' : ($user->gender === \Gender::FEMALE ? '女' : '不明'); |
| @@ -298,7 +295,7 @@ | ||
| 298 | 295 | return $id; |
| 299 | 296 | } |
| 300 | 297 | |
| 301 | - private function getUserData(): \stdClass { | |
| 298 | + private function getUserData(): ?\stdClass { | |
| 302 | 299 | if (!AUTH_ENABLED) return new \stdClass; |
| 303 | 300 | $file = scandir($this->dataDir); |
| 304 | 301 | $userFile = ""; |