diff options
| author | Greg Roach <fisharebest@gmail.com> | 2013-09-06 20:48:13 +0100 |
|---|---|---|
| committer | Greg Roach <fisharebest@gmail.com> | 2013-09-06 20:48:13 +0100 |
| commit | 6177ff2976f3cebbc19c71f9f789fe219c9daa37 (patch) | |
| tree | 58e7744e7a2dad1c05fa0774445d75668c7d2da8 /library | |
| parent | fda475306d4ca2be95041a813358716331a5d68f (diff) | |
| download | webtrees-6177ff2976f3cebbc19c71f9f789fe219c9daa37.tar.gz webtrees-6177ff2976f3cebbc19c71f9f789fe219c9daa37.tar.bz2 webtrees-6177ff2976f3cebbc19c71f9f789fe219c9daa37.zip | |
#1220899 - canShowName() on a non-object - Familybook.php
Diffstat (limited to 'library')
| -rw-r--r-- | library/WT/Controller/Familybook.php | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/library/WT/Controller/Familybook.php b/library/WT/Controller/Familybook.php index 8e4824c094..47438a4a98 100644 --- a/library/WT/Controller/Familybook.php +++ b/library/WT/Controller/Familybook.php @@ -45,7 +45,6 @@ class WT_Controller_Familybook extends WT_Controller_Chart { $MAX_DESCENDANCY_GENERATIONS=get_gedcom_setting(WT_GED_ID, 'MAX_DESCENDANCY_GENERATIONS'); // Extract the request parameters - $this->pid = WT_Filter::get('rootid', WT_REGEX_XREF); $this->show_full = WT_Filter::getInteger('show_full', 0, 1, $PEDIGREE_FULL_DETAILS); $this->show_spouse = WT_Filter::getInteger('show_spouse', 0, 1); $this->descent = WT_Filter::getInteger('descent', 0, 9, 5); @@ -59,14 +58,6 @@ class WT_Controller_Familybook extends WT_Controller_Chart { $bwidth =$Dbwidth; $bheight =$Dbheight; - // Validate parameters - if (!empty($rootid)) $this->pid = $rootid; - $rootid=$this->rootid; - $this->hourPerson = WT_Individual::getInstance($this->pid); - if (!$this->hourPerson) { - $this->hourPerson=$this->getSignificantIndividual(); - $this->pid=$this->hourPerson->getXref(); - } // -- adjust size of the compact box if (!$this->show_full) { $bwidth = $this->box_width * $cbwidth / 100; |