Remove global

7 files changed, 28 insertions, 28 deletions

diff --git a/resources/views/cards/add-associate.php b/resources/views/cards/add-associate.php
index d4fd0de91a..07a1a4010c 100644
--- a/resources/views/cards/add-associate.php
+++ b/resources/views/cards/add-associate.php
@@ -9,9 +9,9 @@
 	</div>
 
 	<div class="card-body collapse" id="<?= e($id) ?>">
-		<?= FunctionsEdit::addSimpleTag($level . ' _ASSO @') ?>
-		<?= FunctionsEdit::addSimpleTag(($level + 1) . ' RELA') ?>
-		<?= FunctionsEdit::addSimpleTag(($level + 1) . ' NOTE') ?>
-		<?= FunctionsEdit::addSimpleTag(($level + 1) . ' SHARED_NOTE') ?>
+		<?= FunctionsEdit::addSimpleTag($tree, $level . ' _ASSO @') ?>
+		<?= FunctionsEdit::addSimpleTag($tree, ($level + 1) . ' RELA') ?>
+		<?= FunctionsEdit::addSimpleTag($tree, ($level + 1) . ' NOTE') ?>
+		<?= FunctionsEdit::addSimpleTag($tree, ($level + 1) . ' SHARED_NOTE') ?>
 	</div>
 </div>
diff --git a/resources/views/cards/add-media-object.php b/resources/views/cards/add-media-object.php
index af28d2f3f0..bca793aac3 100644
--- a/resources/views/cards/add-media-object.php
+++ b/resources/views/cards/add-media-object.php
@@ -9,6 +9,6 @@
 	</div>
 
 	<div class="card-body collapse" id="add-media-object">
-		<?= FunctionsEdit::addSimpleTag($level . ' OBJE') ?>
+		<?= FunctionsEdit::addSimpleTag($tree, $level . ' OBJE') ?>
 	</div>
 </div>
diff --git a/resources/views/cards/add-note.php b/resources/views/cards/add-note.php
index d69931a872..42340ef7c8 100644
--- a/resources/views/cards/add-note.php
+++ b/resources/views/cards/add-note.php
@@ -9,6 +9,6 @@
 	</div>
 
 	<div class="card-body collapse" id="add-note">
-		<?= FunctionsEdit::addSimpleTag($level . ' NOTE') ?>
+		<?= FunctionsEdit::addSimpleTag($tree, $level . ' NOTE') ?>
 	</div>
 </div>
diff --git a/resources/views/cards/add-restriction.php b/resources/views/cards/add-restriction.php
index d412321fba..ec71e9dbd6 100644
--- a/resources/views/cards/add-restriction.php
+++ b/resources/views/cards/add-restriction.php
@@ -9,6 +9,6 @@
 	</div>
 
 	<div class="card-body collapse" id="add-restriction">
-		<?= FunctionsEdit::addSimpleTag($level . ' RESN') ?>
+		<?= FunctionsEdit::addSimpleTag($tree, $level . ' RESN') ?>
 	</div>
 </div>
diff --git a/resources/views/cards/add-shared-note.php b/resources/views/cards/add-shared-note.php
index 4fcbabd779..37a4504aa2 100644
--- a/resources/views/cards/add-shared-note.php
+++ b/resources/views/cards/add-shared-note.php
@@ -9,6 +9,6 @@
 	</div>
 
 	<div class="card-body collapse" id="add-note-object">
-		<?= FunctionsEdit::addSimpleTag($level . ' SHARED_NOTE') ?>
+		<?= FunctionsEdit::addSimpleTag($tree, $level . ' SHARED_NOTE') ?>
 	</div>
 </div>
diff --git a/resources/views/cards/add-source-citation.php b/resources/views/cards/add-source-citation.php
index da3e1cc1a9..cf495345c8 100644
--- a/resources/views/cards/add-source-citation.php
+++ b/resources/views/cards/add-source-citation.php
@@ -10,7 +10,7 @@
 	</div>
 
 	<div class="card-body collapse" id="add-source-citation">
-		<?= FunctionsEdit::addSimpleTag($level . ' SOUR @') ?>
+		<?= FunctionsEdit::addSimpleTag($tree, $level . ' SOUR @') ?>
 
 		<?php if ($level === 1): ?>
 			<div class="row">
@@ -64,16 +64,16 @@
 			</div>
 		<?php endif ?>
 
-		<?= FunctionsEdit::addSimpleTag(($level + 1) . ' PAGE') ?>
-		<?= FunctionsEdit::addSimpleTag(($level + 1) . ' DATA') ?>
-		<?= FunctionsEdit::addSimpleTag(($level + 2) . ' TEXT') ?>
+		<?= FunctionsEdit::addSimpleTag($tree, ($level + 1) . ' PAGE') ?>
+		<?= FunctionsEdit::addSimpleTag($tree, ($level + 1) . ' DATA') ?>
+		<?= FunctionsEdit::addSimpleTag($tree, ($level + 2) . ' TEXT') ?>
 
 		<?php if ($full_citations): ?>
-			<?= FunctionsEdit::addSimpleTag(($level + 2) . ' DATE', '', I18N::translate('Date of entry in original source')) ?>
-			<?= FunctionsEdit::addSimpleTag(($level + 1) . ' QUAY') ?>
+			<?= FunctionsEdit::addSimpleTag($tree, ($level + 2) . ' DATE', '', I18N::translate('Date of entry in original source')) ?>
+			<?= FunctionsEdit::addSimpleTag($tree, ($level + 1) . ' QUAY') ?>
 		<?php endif ?>
 
-		<?= FunctionsEdit::addSimpleTag(($level + 1) . ' OBJE') ?>
-		<?= FunctionsEdit::addSimpleTag(($level + 1) . ' SHARED_NOTE') ?>
+		<?= FunctionsEdit::addSimpleTag($tree, ($level + 1) . ' OBJE') ?>
+		<?= FunctionsEdit::addSimpleTag($tree, ($level + 1) . ' SHARED_NOTE') ?>
 	</div>
 </div>
diff --git a/resources/views/edit/new-individual.php b/resources/views/edit/new-individual.php
index e8c508780c..ac5bea7fda 100644
--- a/resources/views/edit/new-individual.php
+++ b/resources/views/edit/new-individual.php
@@ -140,14 +140,14 @@ $bdm = ''; // used to copy '1 SOUR' to '2 SOUR' for BIRT DEAT MARR
 	<?= csrf_field() ?>
 
 	<?php if ($nextaction === 'add_child_to_family_action' || $nextaction === 'add_child_to_individual_action'): ?>
-		<?= FunctionsEdit::addSimpleTag('0 PEDI') ?>
+		<?= FunctionsEdit::addSimpleTag($tree, '0 PEDI') ?>
 	<?php endif ?>
 
 	<?php
 	// First - standard name fields
 	foreach ($name_fields as $tag => $value) {
 		if (substr_compare($tag, '_', 0, 1) !== 0) {
-			echo FunctionsEdit::addSimpleTag('0 ' . $tag . ' ' . $value, '', '', null, $individual);
+			echo FunctionsEdit::addSimpleTag($tree, '0 ' . $tag . ' ' . $value, '', '', null, $individual);
 		}
 	}
 
@@ -170,18 +170,18 @@ $bdm = ''; // used to copy '1 SOUR' to '2 SOUR' for BIRT DEAT MARR
 		// Edit existing tags, grouped together
 		if (preg_match_all('/2 ' . $tag . ' (.+)/', $namerec, $match)) {
 			foreach ($match[1] as $value) {
-				echo FunctionsEdit::addSimpleTag('2 ' . $tag . ' ' . $value, '', GedcomTag::getLabel('NAME:' . $tag, $individual));
+				echo FunctionsEdit::addSimpleTag($tree, '2 ' . $tag . ' ' . $value, '', GedcomTag::getLabel('NAME:' . $tag, $individual));
 				if ($tag === '_MARNM') {
 					preg_match_all('/\/([^\/]*)\//', $value, $matches);
-					echo FunctionsEdit::addSimpleTag('2 _MARNM_SURN ' . implode(',', $matches[1]));
+					echo FunctionsEdit::addSimpleTag($tree, '2 _MARNM_SURN ' . implode(',', $matches[1]));
 				}
 			}
 		}
 		// Allow a new tag to be entered
 		if (!array_key_exists($tag, $name_fields)) {
-			echo FunctionsEdit::addSimpleTag('0 ' . $tag, '', GedcomTag::getLabel('NAME:' . $tag, $individual));
+			echo FunctionsEdit::addSimpleTag($tree, '0 ' . $tag, '', GedcomTag::getLabel('NAME:' . $tag, $individual));
 			if ($tag === '_MARNM') {
-				echo FunctionsEdit::addSimpleTag('0 _MARNM_SURN');
+				echo FunctionsEdit::addSimpleTag($tree, '0 _MARNM_SURN');
 			}
 		}
 	}
@@ -189,10 +189,10 @@ $bdm = ''; // used to copy '1 SOUR' to '2 SOUR' for BIRT DEAT MARR
 	// Third - new/existing custom name fields
 	foreach ($name_fields as $tag => $value) {
 		if (substr_compare($tag, '_', 0, 1) === 0) {
-			echo FunctionsEdit::addSimpleTag('0 ' . $tag . ' ' . $value);
+			echo FunctionsEdit::addSimpleTag($tree, '0 ' . $tag . ' ' . $value);
 			if ($tag === '_MARNM') {
 				preg_match_all('/\/([^\/]*)\//', $value, $matches);
-				echo FunctionsEdit::addSimpleTag('2 _MARNM_SURN ' . implode(',', $matches[1]));
+				echo FunctionsEdit::addSimpleTag($tree, '2 _MARNM_SURN ' . implode(',', $matches[1]));
 			}
 		}
 	}
@@ -219,7 +219,7 @@ $bdm = ''; // used to copy '1 SOUR' to '2 SOUR' for BIRT DEAT MARR
 					$text .= "\n" . $cmatch[1];
 					$i++;
 				}
-				echo FunctionsEdit::addSimpleTag($level . ' ' . $type . ' ' . $text);
+				echo FunctionsEdit::addSimpleTag($tree, $level . ' ' . $type . ' ' . $text);
 			}
 			$tags[] = $type;
 			$i++;
@@ -238,11 +238,11 @@ $bdm = ''; // used to copy '1 SOUR' to '2 SOUR' for BIRT DEAT MARR
 		echo '</table><br><table class="table wt-facts-table">';
 		// 1 SEX
 		if ($famtag === 'HUSB' || $gender === 'M') {
-			echo FunctionsEdit::addSimpleTag('0 SEX M');
+			echo FunctionsEdit::addSimpleTag($tree, '0 SEX M');
 		} elseif ($famtag === 'WIFE' || $gender === 'F') {
-			echo FunctionsEdit::addSimpleTag('0 SEX F');
+			echo FunctionsEdit::addSimpleTag($tree, '0 SEX F');
 		} else {
-			echo FunctionsEdit::addSimpleTag('0 SEX U');
+			echo FunctionsEdit::addSimpleTag($tree, '0 SEX U');
 		}
 		$bdm = 'BD';
 		if (preg_match_all('/(' . WT_REGEX_TAG . ')/', $tree->getPreference('QUICK_REQUIRED_FACTS'), $matches)) {