Remove some old/unused variables

5 files changed, 2 insertions, 19 deletions

diff --git a/includes/controllers/individual_ctrl.php b/includes/controllers/individual_ctrl.php
index 754e919fd4..0a74cce940 100644
--- a/includes/controllers/individual_ctrl.php
+++ b/includes/controllers/individual_ctrl.php
@@ -44,7 +44,6 @@ class IndividualController extends BaseController {
 	var $accept_success = false;
 	var $default_tab = '';
 
-	var $canedit = false;
 	var $name_count = 0;
 	var $total_names = 0;
 	var $SEX_COUNT = 0;
@@ -150,11 +149,6 @@ class IndividualController extends BaseController {
 			$this->indi->diffMerge($this->diffindi);
 		}
 
-		//-- only allow editors or users who are editing their own individual or their immediate relatives
-		if ($this->indi->canDisplayDetails()) {
-			$this->canedit = WT_USER_CAN_EDIT;
-		}
-
 		// Initialise tabs
 		$this->tabs = WT_Module::getActiveTabs();
 		foreach ($this->tabs as $mod) {
@@ -243,13 +237,7 @@ class IndividualController extends BaseController {
 		if (WT_USER_CAN_EDIT && $SHOW_GEDCOM_RECORD && $this->indi->canDisplayDetails())
 			return true;
 	}
-	/**
-	* check if use can edit this person
-	* @return boolean
-	*/
-	function userCanEdit() {
-		return $this->canedit;
-	}
+
 	/**
 	* get the highlighted object HTML
 	* @return string HTML string for the <img> tag
diff --git a/includes/controllers/media_ctrl.php b/includes/controllers/media_ctrl.php
index 7d6feb408b..7ad15e0753 100644
--- a/includes/controllers/media_ctrl.php
+++ b/includes/controllers/media_ctrl.php
@@ -125,8 +125,8 @@ class MediaController extends BaseController{
 				accept_all_changes($this->pid, WT_GED_ID);
 				$this->show_changes=false;
 				$this->accept_success=true;
-				$mediarec = find_media_record($this->pid, get_id_from_gedcom($GEDCOM));
 				//-- check if we just deleted the record and redirect to index
+				$mediarec = find_media_record($this->pid, WT_GED_ID);
 				if (empty($mediarec)) {
 					header('Location: '.WT_SERVER_NAME.WT_SCRIPT_PATH);
 					exit;
@@ -152,8 +152,6 @@ class MediaController extends BaseController{
 			break;
 		}
 
-		if ($this->mediaobject->canDisplayDetails()) {
-			$this->canedit = WT_USER_CAN_EDIT;
 		}
 	}
 
diff --git a/includes/controllers/note_ctrl.php b/includes/controllers/note_ctrl.php
index 2ce67c4e0e..a0eeecc0c2 100644
--- a/includes/controllers/note_ctrl.php
+++ b/includes/controllers/note_ctrl.php
@@ -41,7 +41,6 @@ class NoteController extends BaseController {
 	var $note = null;
 	var $diffnote = null;
 	var $accept_success = false;
-	var $canedit = false;
 
 	function init() {
 		$this->nid = safe_GET_xref('nid');
diff --git a/includes/controllers/repository_ctrl.php b/includes/controllers/repository_ctrl.php
index 1a535fbfce..e93735f7bd 100644
--- a/includes/controllers/repository_ctrl.php
+++ b/includes/controllers/repository_ctrl.php
@@ -41,7 +41,6 @@ class RepositoryController extends BaseController {
 	var $repository = null;
 	var $diffrepository = null;
 	var $accept_success = false;
-	var $canedit = false;
 
 	function init() {
 		$this->rid = safe_GET_xref('rid');
diff --git a/includes/controllers/source_ctrl.php b/includes/controllers/source_ctrl.php
index 961aafd6ba..fa1181afe1 100644
--- a/includes/controllers/source_ctrl.php
+++ b/includes/controllers/source_ctrl.php
@@ -41,7 +41,6 @@ class SourceController extends BaseController {
 	var $source = null;
 	var $diffsource = null;
 	var $accept_success = false;
-	var $canedit = false;
 
 	function init() {
 		$this->sid = safe_GET_xref('sid');