diff options
| author | Greg Roach <fisharebest@gmail.com> | 2013-12-28 18:36:05 +0000 |
|---|---|---|
| committer | Greg Roach <fisharebest@gmail.com> | 2013-12-28 18:38:43 +0000 |
| commit | 353571196e8c568cb97f0fd09fdcaba63a980839 (patch) | |
| tree | e6aaeda5d9d138bc68e7ee680f53f1f5738248e0 | |
| parent | cbd71d9affee2c8f7c6eea0a760e18c85e1aa674 (diff) | |
| download | webtrees-353571196e8c568cb97f0fd09fdcaba63a980839.tar.gz webtrees-353571196e8c568cb97f0fd09fdcaba63a980839.tar.bz2 webtrees-353571196e8c568cb97f0fd09fdcaba63a980839.zip | |
Family tab and family-navigator ignoring the 'Show private relationships' setting
| -rw-r--r-- | modules_v3/family_nav/module.php | 13 | ||||
| -rw-r--r-- | modules_v3/relatives/module.php | 4 |
2 files changed, 12 insertions, 5 deletions
diff --git a/modules_v3/family_nav/module.php b/modules_v3/family_nav/module.php index 9d69499ab9..6374f804f1 100644 --- a/modules_v3/family_nav/module.php +++ b/modules_v3/family_nav/module.php @@ -108,8 +108,15 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar { private function drawFamily(WT_Individual $root, WT_Family $family) { global $controller; global $spouselinks, $parentlinks; + global $SHOW_PRIVATE_RELATIONSHIPS; - foreach ($family->getFacts('HUSB') as $fact) { + if ($SHOW_PRIVATE_RELATIONSHIPS) { + $access_level = WT_PRIV_HIDE; + } else { + $access_level = WT_USER_ACCESS_LEVEL; + } + + foreach ($family->getFacts('HUSB', false, $access_level) as $fact) { $spouse = $fact->getTarget(); if ($spouse instanceof WT_Individual) { $menu = new WT_Menu(get_close_relationship_name($root, $spouse)); @@ -125,7 +132,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar { } } - foreach ($family->getFacts('WIFE') as $fact) { + foreach ($family->getFacts('WIFE', false, $access_level) as $fact) { $spouse = $fact->getTarget(); if ($spouse instanceof WT_Individual) { $menu = new WT_Menu(get_close_relationship_name($root, $spouse)); @@ -141,7 +148,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar { } } - foreach ($family->getFacts('CHIL') as $fact) { + foreach ($family->getFacts('CHIL', false, $access_level) as $fact) { $child = $fact->getTarget(); if ($child instanceof WT_Individual) { $menu = new WT_Menu(get_close_relationship_name($root, $child)); diff --git a/modules_v3/relatives/module.php b/modules_v3/relatives/module.php index 42b765efc4..8099304d71 100644 --- a/modules_v3/relatives/module.php +++ b/modules_v3/relatives/module.php @@ -131,7 +131,7 @@ class relatives_WT_Module extends WT_Module implements WT_Module_Tab { ///// WIFE ///// $found = false; - foreach ($family->getFacts('WIFE', $access_level) as $fact) { + foreach ($family->getFacts('WIFE', false, $access_level) as $fact) { $person = $fact->getTarget(); if ($person instanceof WT_Individual) { $found |= !$fact->isOld(); @@ -207,7 +207,7 @@ class relatives_WT_Module extends WT_Module implements WT_Module_Tab { ///// CHIL ///// $child_number = 0; - foreach ($family->getFacts('CHIL', $access_level) as $fact) { + foreach ($family->getFacts('CHIL', false, $access_level) as $fact) { $person = $fact->getTarget(); if ($person instanceof WT_Individual) { if ($fact->isNew()) { |