diff options
| author | fisharebest <fisharebest@gmail.com> | 2010-05-05 16:54:33 +0000 |
|---|---|---|
| committer | fisharebest <fisharebest@gmail.com> | 2010-05-05 16:54:33 +0000 |
| commit | 769088e9a9794b9b02968ec1b9f0f2f0f6d2d3b6 (patch) | |
| tree | 9b936cfab21fd446d3ed1c2e3b160e669973022c /includes/controllers | |
| parent | 6b02c56b1632a1b4c2199e221d6d2a9d38f90d59 (diff) | |
| download | webtrees-769088e9a9794b9b02968ec1b9f0f2f0f6d2d3b6.tar.gz webtrees-769088e9a9794b9b02968ec1b9f0f2f0f6d2d3b6.tar.bz2 webtrees-769088e9a9794b9b02968ec1b9f0f2f0f6d2d3b6.zip | |
Fix: Recent changes to technical and genealogy contacts were incomplete
Diffstat (limited to 'includes/controllers')
| -rw-r--r-- | includes/controllers/family_ctrl.php | 2 | ||||
| -rw-r--r-- | includes/controllers/lifespan_ctrl.php | 1 | ||||
| -rw-r--r-- | includes/controllers/note_ctrl.php | 2 | ||||
| -rw-r--r-- | includes/controllers/repository_ctrl.php | 2 | ||||
| -rw-r--r-- | includes/controllers/source_ctrl.php | 2 | ||||
| -rw-r--r-- | includes/controllers/timeline_ctrl.php | 1 |
6 files changed, 1 insertions, 9 deletions
diff --git a/includes/controllers/family_ctrl.php b/includes/controllers/family_ctrl.php index dc5b99cf3f..7821fb68e4 100644 --- a/includes/controllers/family_ctrl.php +++ b/includes/controllers/family_ctrl.php @@ -66,7 +66,7 @@ class FamilyRoot extends BaseController { } function init() { - global $Dbwidth, $bwidth, $pbwidth, $pbheight, $bheight, $GEDCOM, $CONTACT_EMAIL, $show_famlink; + global $Dbwidth, $bwidth, $pbwidth, $pbheight, $bheight, $GEDCOM, $show_famlink; $bwidth = $Dbwidth; $pbwidth = $bwidth + 12; $pbheight = $bheight + 14; diff --git a/includes/controllers/lifespan_ctrl.php b/includes/controllers/lifespan_ctrl.php index b24126d68a..d9f16b1d6f 100644 --- a/includes/controllers/lifespan_ctrl.php +++ b/includes/controllers/lifespan_ctrl.php @@ -568,7 +568,6 @@ class LifespanControllerRoot extends BaseController { * check the privacy of the incoming people to make sure they can be shown */ function checkPrivacy() { - global $CONTACT_EMAIL; $printed = false; for ($i = 0; $i < count($this->people); $i ++) { if (!$this->people[$i]->canDisplayDetails()) { diff --git a/includes/controllers/note_ctrl.php b/includes/controllers/note_ctrl.php index 66afd4f674..3408fca4a6 100644 --- a/includes/controllers/note_ctrl.php +++ b/includes/controllers/note_ctrl.php @@ -64,8 +64,6 @@ class NoteControllerRoot extends BaseController { * initialize the controller */ function init() { - global $CONTACT_EMAIL; - $this->nid = safe_GET_xref('nid'); $noterec = find_other_record($this->nid, WT_GED_ID); diff --git a/includes/controllers/repository_ctrl.php b/includes/controllers/repository_ctrl.php index dd43d1ae00..c9147f7ab7 100644 --- a/includes/controllers/repository_ctrl.php +++ b/includes/controllers/repository_ctrl.php @@ -63,8 +63,6 @@ class RepositoryControllerRoot extends BaseController { * initialize the controller */ function init() { - global $CONTACT_EMAIL; - $this->rid = safe_GET_xref('rid'); $repositoryrec = find_other_record($this->rid, WT_GED_ID); diff --git a/includes/controllers/source_ctrl.php b/includes/controllers/source_ctrl.php index 230b62df79..79fb4c1425 100644 --- a/includes/controllers/source_ctrl.php +++ b/includes/controllers/source_ctrl.php @@ -64,8 +64,6 @@ class SourceControllerRoot extends BaseController { * initialize the controller */ function init() { - global $CONTACT_EMAIL; - $this->sid = safe_GET_xref('sid'); $sourcerec = find_source_record($this->sid, WT_GED_ID); diff --git a/includes/controllers/timeline_ctrl.php b/includes/controllers/timeline_ctrl.php index 278578b858..668ebf583c 100644 --- a/includes/controllers/timeline_ctrl.php +++ b/includes/controllers/timeline_ctrl.php @@ -158,7 +158,6 @@ class TimelineControllerRoot extends BaseController { * check the privacy of the incoming people to make sure they can be shown */ function checkPrivacy() { - global $CONTACT_EMAIL; $printed = false; for($i=0; $i<count($this->people); $i++) { if (!is_null($this->people[$i])) { |