Replace _PGV_OBJS and _WT_OBJS with _WT_OBJE_SORT

12 files changed, 25 insertions, 25 deletions

diff --git a/edit_interface.php b/edit_interface.php
index 8503e6721e..cc1d085ae0 100644
--- a/edit_interface.php
+++ b/edit_interface.php
@@ -2051,7 +2051,7 @@ case 'reset_media_update': // Reset sort using popup
 	$lines = explode("\n", $gedrec);
 	$newgedrec = "";
 	foreach ($lines as $line) {
-		if (strpos($line, "1 _WT_OBJS")===false) {
+		if (strpos($line, "1 _WT_OBJE_SORT")===false) {
 			$newgedrec .= $line."\n";
 		}
 	}
@@ -2068,12 +2068,12 @@ case 'reorder_media_update': // Update sort using popup
 	$lines = explode("\n", $gedrec);
 	$newgedrec = "";
 	foreach ($lines as $line) {
-		if (strpos($line, "1 _WT_OBJS")===false) {
+		if (strpos($line, "1 _WT_OBJE_SORT")===false) {
 			$newgedrec .= $line."\n";
 		}
 	}
 	foreach ($order1 as $m_media=>$num) {
-		$newgedrec .= "1 _WT_OBJS @".$m_media."@\n";
+		$newgedrec .= "1 _WT_OBJE_SORT @".$m_media."@\n";
 	}
 	if (WT_DEBUG) {
 		echo "<pre>$newgedrec</pre>";
@@ -2098,7 +2098,7 @@ case 'al_reset_media_update': // Reset sort using Album Page
 	$lines = explode("\n", $gedrec);
 	$newgedrec = "";
 	foreach ($lines as $line) {
-		if (strpos($line, "1 _WT_OBJS")===false) {
+		if (strpos($line, "1 _WT_OBJE_SORT")===false) {
 			$newgedrec .= $line."\n";
 		}
 	}
@@ -2133,12 +2133,12 @@ case 'al_reorder_media_update': // Update sort using Album Page
 	$lines = explode("\n", $gedrec);
 	$newgedrec = "";
 	foreach ($lines as $line) {
-		if (strpos($line, "1 _WT_OBJS")===false) {
+		if (strpos($line, "1 _WT_OBJE_SORT")===false) {
 			$newgedrec .= $line."\n";
 		}
 	}
 	foreach ($order2 as $m_media=>$num) {
-		$newgedrec .= "1 _WT_OBJS @".$m_media."@\n";
+		$newgedrec .= "1 _WT_OBJE_SORT @".$m_media."@\n";
 	}
 	if (WT_DEBUG) {
 		echo "<pre>$newgedrec</pre>";
diff --git a/expand_view.php b/expand_view.php
index 48f455609b..dca574becc 100644
--- a/expand_view.php
+++ b/expand_view.php
@@ -34,7 +34,7 @@ $pid = safe_GET_xref('pid');
 $person = Person::getInstance($pid);
 if (!$person->canDisplayDetails()) return i18n::translate('Private');
 
-$nonfacts = array("SEX","FAMS","FAMC","NAME","TITL","NOTE","SOUR","SSN","OBJE","HUSB","WIFE","CHIL","ALIA","ADDR","PHON","SUBM","_EMAIL","CHAN","URL","EMAIL","WWW","RESI","_UID","_TODO","_WT_OBJS","_PGV_OBJS");
+$nonfacts = array("SEX","FAMS","FAMC","NAME","TITL","NOTE","SOUR","SSN","OBJE","HUSB","WIFE","CHIL","ALIA","ADDR","PHON","SUBM","_EMAIL","CHAN","URL","EMAIL","WWW","RESI","_UID","_TODO","_WT_OBJE_SORT","_WT_OBJE_SORT");
 $person->add_family_facts(false);
 $subfacts = $person->getIndiFacts();
 
diff --git a/gedcheck.php b/gedcheck.php
index 0fe0bd8a91..f949c2b0c0 100644
--- a/gedcheck.php
+++ b/gedcheck.php
@@ -147,7 +147,7 @@ $XREF_LINK=array(
 	'ALIA'=>'INDI',
 	'ANCI'=>'SUBM',
 	'DESI'=>'SUBM',
-	'_WT_OBJS'=>'OBJE',
+	'_WT_OBJE_SORT'=>'OBJE',
 	'AUTH'=>'INDI'  // This is not valid gedcom, but it is not an error if used.
 );
 
diff --git a/includes/controllers/individual_ctrl.php b/includes/controllers/individual_ctrl.php
index de44bf896e..f7fac77736 100644
--- a/includes/controllers/individual_ctrl.php
+++ b/includes/controllers/individual_ctrl.php
@@ -51,8 +51,8 @@ $nonfacts[] = "CHIL";
 $nonfacts[] = "HUSB";
 $nonfacts[] = "WIFE";
 $nonfacts[] = "RFN";
-$nonfacts[] = "_WT_OBJS";
-$nonfacts[] = "_PGV_OBJS";
+$nonfacts[] = "_WT_OBJE_SORT";
+$nonfacts[] = "_WT_OBJE_SORT";
 $nonfacts[] = "";
 
 //$nonfamfacts[] = "NCHI"; // Turning back on NCHI display for the indi page.
diff --git a/includes/controllers/lifespan_ctrl.php b/includes/controllers/lifespan_ctrl.php
index ea98500657..55af468f7d 100644
--- a/includes/controllers/lifespan_ctrl.php
+++ b/includes/controllers/lifespan_ctrl.php
@@ -45,7 +45,7 @@ function compare_people($a, $b) {
 
 
 // GEDCOM elements that will be found but should not be displayed
-$nonfacts = array("FAMS", "FAMC", "MAY", "BLOB", "OBJE", "SEX", "NAME", "SOUR", "NOTE", "BAPL", "ENDL", "SLGC", "SLGS", "_TODO", "_WT_OBJS", "CHAN", "HUSB", "WIFE", "CHIL", "BIRT", "DEAT", "BURI");// DEATH OF SIBLING:  DEATH OF HALF SIBLING DEATH OF MOTHER DEATH OF FATHER DEATH OF CHILD
+$nonfacts = array("FAMS", "FAMC", "MAY", "BLOB", "OBJE", "SEX", "NAME", "SOUR", "NOTE", "BAPL", "ENDL", "SLGC", "SLGS", "_TODO", "_WT_OBJE_SORT", "CHAN", "HUSB", "WIFE", "CHIL", "BIRT", "DEAT", "BURI");// DEATH OF SIBLING:  DEATH OF HALF SIBLING DEATH OF MOTHER DEATH OF FATHER DEATH OF CHILD
 $nonfamfacts = array("CHAN", "HUSB", "WIFE", "CHIL");
 
 /**
diff --git a/includes/functions/functions_print_facts.php b/includes/functions/functions_print_facts.php
index e1d6c636f3..f59840e3d3 100644
--- a/includes/functions/functions_print_facts.php
+++ b/includes/functions/functions_print_facts.php
@@ -1264,10 +1264,10 @@ function print_main_media($pid, $level=1, $related=false, $noedit=false) {
 		}
 	}
 
-	//LBox -- if  exists, get a list of the sorted current objects in the indi gedcom record  -  (1 _WT_OBJS @xxx@ .... etc) ----------
+	//LBox -- if  exists, get a list of the sorted current objects in the indi gedcom record  -  (1 _WT_OBJE_SORT @xxx@ .... etc) ----------
 	$sort_current_objes = array();
-	if ($level>0) $sort_regexp = "/".$level." _WT_OBJS @(.*)@/";
-	else $sort_regexp = "/_WT_OBJS @(.*)@/";
+	if ($level>0) $sort_regexp = "/".$level." _WT_OBJE_SORT @(.*)@/";
+	else $sort_regexp = "/_WT_OBJE_SORT @(.*)@/";
 	$sort_ct = preg_match_all($sort_regexp, $gedrec, $sort_match, PREG_SET_ORDER);
 	for($i=0; $i<$sort_ct; $i++) {
 		if (!isset($sort_current_objes[$sort_match[$i][1]])) $sort_current_objes[$sort_match[$i][1]] = 1;
diff --git a/includes/media_reorder.php b/includes/media_reorder.php
index b6b13ca75d..5c9bbf6fde 100644
--- a/includes/media_reorder.php
+++ b/includes/media_reorder.php
@@ -81,10 +81,10 @@ require_once WT_ROOT.'includes/functions/functions_print_facts.php';
 		}
 	}
 
-	//-- If  they exist, get a list of the sorted current objects in the indi gedcom record  -  (1 _WT_OBJS @xxx@ .... etc) ----------
+	//-- If  they exist, get a list of the sorted current objects in the indi gedcom record  -  (1 _WT_OBJE_SORT @xxx@ .... etc) ----------
 	$sort_current_objes = array();
-	if ($level>0) $sort_regexp = "/".$level." _WT_OBJS @(.*)@/";
-	else $sort_regexp = "/_WT_OBJS @(.*)@/";
+	if ($level>0) $sort_regexp = "/".$level." _WT_OBJE_SORT @(.*)@/";
+	else $sort_regexp = "/_WT_OBJE_SORT @(.*)@/";
 	$sort_ct = preg_match_all($sort_regexp, $gedrec, $sort_match, PREG_SET_ORDER);
 	for ($i=0; $i<$sort_ct; $i++) {
 		if (!isset($sort_current_objes[$sort_match[$i][1]])) $sort_current_objes[$sort_match[$i][1]] = 1;
diff --git a/modules/family_group_report/report.xml b/modules/family_group_report/report.xml
index ee0b38b7d7..c58edcff3c 100644
--- a/modules/family_group_report/report.xml
+++ b/modules/family_group_report/report.xml
@@ -37,10 +37,10 @@
 
 	<!-- if the option to show blanks is selected then ignore the MARR, BIRT etc facts that are printed with the blanks -->
 	<PGVRif condition="$blanks==1">
-		<PGVRSetVar name="ignore" value="CHAN,NAME,SEX,SOUR,NOTE,OBJE,FAMC,FAMS,TITL,CHIL,HUSB,WIFE,MARR,BIRT,CHR,DEAT,BURI,_UID,_PGV_OBJS" />
+		<PGVRSetVar name="ignore" value="CHAN,NAME,SEX,SOUR,NOTE,OBJE,FAMC,FAMS,TITL,CHIL,HUSB,WIFE,MARR,BIRT,CHR,DEAT,BURI,_UID,_WT_OBJE_SORT" />
 	</PGVRif>
 	<PGVRif condition="$blanks!=1">
-		<PGVRSetVar name="ignore" value="CHAN,NAME,SEX,SOUR,NOTE,OBJE,FAMC,FAMS,TITL,CHIL,HUSB,WIFE,_UID,_PGV_OBJS" />
+		<PGVRSetVar name="ignore" value="CHAN,NAME,SEX,SOUR,NOTE,OBJE,FAMC,FAMS,TITL,CHIL,HUSB,WIFE,_UID,_WT_OBJE_SORT" />
 	</PGVRif>
 	<!-- Setup colors -->
 	<!-- Section title background color -->
diff --git a/modules/individual_ext_report/report.xml b/modules/individual_ext_report/report.xml
index f3ed3fb2ed..bbc1fc9426 100644
--- a/modules/individual_ext_report/report.xml
+++ b/modules/individual_ext_report/report.xml
@@ -37,7 +37,7 @@
 	<!-- Date text -->
 	<PGVRStyle name="date" font="$fonts" size="8"/>
 
-	<PGVRSetVar name="ignore" value="CHAN,CHIL,FAMC,FAMS,HUSB,NAME,NOTE,OBJE,SEX,SOUR,TITL,WIFE,_UID,_PGV_OBJS"/>
+	<PGVRSetVar name="ignore" value="CHAN,CHIL,FAMC,FAMS,HUSB,NAME,NOTE,OBJE,SEX,SOUR,TITL,WIFE,_UID,_WT_OBJE_SORT"/>
 	<!-- Setup colors -->
 	<!-- Section title background color -->
 	<PGVRSetVar name="stbgcolor" value="#AAAAAA"/>
diff --git a/modules/individual_report/report.xml b/modules/individual_report/report.xml
index 0538282a93..453e2f9f6c 100644
--- a/modules/individual_report/report.xml
+++ b/modules/individual_report/report.xml
@@ -27,7 +27,7 @@
 	<PGVRStyle name="name1" font="$fonts" size="14" />
 	<PGVRStyle name="text" font="$fonts" size="9" />
 
-	<PGVRSetVar name="ignore" value="CHAN,NAME,SEX,SOUR,NOTE,OBJE,FAMC,FAMS,TITL,CHIL,HUSB,WIFE,_UID,_PGV_OBJS" />
+	<PGVRSetVar name="ignore" value="CHAN,NAME,SEX,SOUR,NOTE,OBJE,FAMC,FAMS,TITL,CHIL,HUSB,WIFE,_UID,_WT_OBJE_SORT" />
 	<!-- Section title background color -->
 	<PGVRSetVar name="stbgcolor" value="#AAAAAA"/>
 	<!-- set the default widths -->
diff --git a/modules/lightbox/functions/lightbox_print_media.php b/modules/lightbox/functions/lightbox_print_media.php
index 7d8afc84c0..ff19203131 100644
--- a/modules/lightbox/functions/lightbox_print_media.php
+++ b/modules/lightbox/functions/lightbox_print_media.php
@@ -74,10 +74,10 @@ function lightbox_print_media($pid, $level=1, $related=false, $kind=1, $noedit=f
 		}
 	}
 
-	//LBox -- if  exists, get a list of the sorted current objects in the indi gedcom record  -  (1 _WT_OBJS @xxx@ .... etc) ----------
+	//LBox -- if  exists, get a list of the sorted current objects in the indi gedcom record  -  (1 _WT_OBJE_SORT @xxx@ .... etc) ----------
 	$sort_current_objes = array();
-	if ($level>0) $sort_regexp = "/".$level." _WT_OBJS @(.*)@/";
-	else $sort_regexp = "/_WT_OBJS @(.*)@/";
+	if ($level>0) $sort_regexp = "/".$level." _WT_OBJE_SORT @(.*)@/";
+	else $sort_regexp = "/_WT_OBJE_SORT @(.*)@/";
 	$sort_ct = preg_match_all($sort_regexp, $gedrec, $sort_match, PREG_SET_ORDER);
 	for ($i=0; $i<$sort_ct; $i++) {
 		if (!isset($sort_current_objes[$sort_match[$i][1]])) $sort_current_objes[$sort_match[$i][1]] = 1;
diff --git a/modules/source_report/report.xml b/modules/source_report/report.xml
index 297a97abbe..e799f0781d 100644
--- a/modules/source_report/report.xml
+++ b/modules/source_report/report.xml
@@ -33,7 +33,7 @@
 	<PGVRSetVar name="vspace" value="5" />
 	<PGVRSetVar name="printedsource" value="0" />
 	<PGVRSetVar name="moresourcespaceindi" value="$nameindi + $datebirth" />
-	<PGVRSetVar name="ignore" value="CHAN,CHIL,FAMC,FAMS,HUSB,NAME,NOTE,OBJE,SEX,SOUR,TITL,WIFE,_UID,_PGV_OBJS"/>
+	<PGVRSetVar name="ignore" value="CHAN,CHIL,FAMC,FAMS,HUSB,NAME,NOTE,OBJE,SEX,SOUR,TITL,WIFE,_UID,_WT_OBJE_SORT"/>
 
 	<PGVRDoc pageSize="$pageSize" orientation="landscape">
 		<PGVRHeader>