Optimize the code for accessing ORCID and organization id in JSON+LD

hubzero · Sep 11, 2024 · 14aae8d · 14aae8d
1 parent bfbaaf8
commit 14aae8d
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/core/plugins/publications/jsonld/jsonld.php b/core/plugins/publications/jsonld/jsonld.php
@@ -104,8 +104,6 @@ public function onPublication($publication, $option, $areas, $rtrn='all', $versi
 
 			$givenName = $contributor->givenName;
 			$familyName = $contributor->surname;
-			$orcid = $contributor->orcid;
-			$orgid = $contributor->orgid;
 
 			if (!$givenName)
 			{
@@ -139,9 +137,9 @@ public function onPublication($publication, $option, $areas, $rtrn='all', $versi
 				'familyName' => $familyName
 			);
 
-			if ($orcid)
+			if ($contributor->orcid)
 			{
-				$author['@id'] = "https://orcid.org/" . $orcid;
+				$author['@id'] = "https://orcid.org/" . $contributor->orcid;
 			}
 
 			if ($contributor->organization)
@@ -151,9 +149,9 @@ public function onPublication($publication, $option, $areas, $rtrn='all', $versi
 					'name'  => $contributor->organization
 				);
 
-				if ($orgid)
+				if ($contributor->orgid)
 				{
-					$org['@id'] = $orgid;
+					$org['@id'] = $contributor->orgid;
 				}
 
 				$author['affiliation'] = $org;