Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions app/GedcomRecord.php
Original file line number Diff line number Diff line change
Expand Up @@ -949,11 +949,6 @@ private function parseFacts(): array
*/
private function canShowRecord(int $access_level): bool
{
// This setting would better be called "$ENABLE_PRIVACY"
if (!$this->tree->getPreference('HIDE_LIVE_PEOPLE')) {
return true;
}

// We should always be able to see our own record (unless an admin is applying download restrictions)
if ($this->xref() === $this->tree->getUserPreference(Auth::user(), UserInterface::PREF_TREE_ACCOUNT_XREF) && $access_level === Auth::accessLevel($this->tree)) {
return true;
Expand Down Expand Up @@ -987,6 +982,13 @@ private function canShowRecord(int $access_level): bool
return true;
}

// This setting would better be called "$ENABLE_PRIVACY".
// It only controls the *default* rules for living people (see canShowByType()) -
// explicit restrictions (RESN tags, individual privacy overrides, above) always apply.
if (!$this->tree->getPreference('HIDE_LIVE_PEOPLE')) {
return true;
}

// Different types of record have different privacy rules
return $this->canShowByType($access_level);
}
Expand Down