summaryrefslogtreecommitdiff
path: root/library/WT/GedcomRecord.php
diff options
context:
space:
mode:
authorfisharebest <fisharebest@gmail.com>2013-07-29 20:50:34 +0000
committerfisharebest <fisharebest@gmail.com>2013-07-29 20:50:34 +0000
commitc61dc66b1da51fb65dd32feb86ec8432b5a02756 (patch)
tree3ce930bdb30bbe69e536902d0f26a9a973a8258d /library/WT/GedcomRecord.php
parentfd36a692c2ee81e41f45b6dcc11ace4fdb636bf9 (diff)
downloadwebtrees-c61dc66b1da51fb65dd32feb86ec8432b5a02756.tar.gz
webtrees-c61dc66b1da51fb65dd32feb86ec8432b5a02756.tar.bz2
webtrees-c61dc66b1da51fb65dd32feb86ec8432b5a02756.zip
If we are going to check privacy just once, and in one place, then we must remember to actually do it there.... :-(
Diffstat (limited to 'library/WT/GedcomRecord.php')
-rw-r--r--library/WT/GedcomRecord.php14
1 files changed, 5 insertions, 9 deletions
diff --git a/library/WT/GedcomRecord.php b/library/WT/GedcomRecord.php
index 4912362a18..fe530a0ef3 100644
--- a/library/WT/GedcomRecord.php
+++ b/library/WT/GedcomRecord.php
@@ -687,17 +687,13 @@ class WT_GedcomRecord {
// The facts and events for this record
public function getFacts($filter=null) {
- if ($filter === null) {
- return $this->facts;
- } else {
- $facts=array();
- foreach ($this->facts as $fact) {
- if (preg_match('/^' . $filter . '$/', $fact->getTag())) {
- $facts[] = $fact;
- }
+ $facts=array();
+ foreach ($this->facts as $fact) {
+ if (($filter==null || preg_match('/^' . $filter . '$/', $fact->getTag())) && $fact->canShow()) {
+ $facts[] = $fact;
}
- return $facts;
}
+ return $facts;
}
//////////////////////////////////////////////////////////////////////////////