From b2dcf98025b2f9e87989b0cb85f71bf1ea3b7ef7 Mon Sep 17 00:00:00 2001
From: GaziYucel <GaziYucel@users.noreply.github.com>
Date: Fri, 31 Jan 2025 16:19:08 +0100
Subject: [PATCH 1/3] pkp/pkp-lib#7135 Multiple author affiliations (Ror)

---
 api/v1/rors/index.php                         | 19 ++++++++++++
 dbscripts/xml/install.xml                     |  6 ++--
 dbscripts/xml/upgrade.xml                     |  6 ++--
 pages/article/ArticleHandler.php              | 11 +++++--
 .../datacite/filter/DataciteXmlFilter.php     | 31 +++++++++----------
 .../doaj/filter/DOAJJsonFilter.php            | 10 +++---
 .../doaj/filter/DOAJXmlFilter.php             | 22 +++++++++----
 .../pubmed/filter/ArticlePubMedXmlFilter.php  | 15 ++++++---
 .../dc/tests/OAIMetadataFormat_DCTest.php     | 13 ++++++--
 .../marc/templates/record.tpl                 |  6 ++--
 .../marcxml/templates/record.tpl              |  6 ++--
 .../rfc1807/OAIMetadataFormat_RFC1807.php     |  9 ++----
 .../reports/articles/ArticleReportPlugin.php  |  6 ++--
 .../frontend/objects/article_details.tpl      | 30 +++++++++---------
 14 files changed, 121 insertions(+), 69 deletions(-)
 create mode 100644 api/v1/rors/index.php

diff --git a/api/v1/rors/index.php b/api/v1/rors/index.php
new file mode 100644
index 00000000000..4da33b61f85
--- /dev/null
+++ b/api/v1/rors/index.php
@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * @defgroup api_v1_rors Ror API requests
+ */
+
+/**
+ * @file api/v1/rors/index.php
+ *
+ * Copyright (c) 2024 Simon Fraser University
+ * Copyright (c) 2024 John Willinsky
+ * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING.
+ *
+ * @ingroup api_v1_rors
+ *
+ * @brief Handle API requests for rors.
+ */
+
+return new \PKP\handler\APIHandler(new \PKP\API\v1\rors\PKPRorController());
diff --git a/dbscripts/xml/install.xml b/dbscripts/xml/install.xml
index ef296cee6dc..87c8ef78b9b 100644
--- a/dbscripts/xml/install.xml
+++ b/dbscripts/xml/install.xml
@@ -3,8 +3,8 @@
 <!--
   * dbscripts/xml/install.xml
   *
-  * Copyright (c) 2014-2021 Simon Fraser University
-  * Copyright (c) 2003-2021 John Willinsky
+  * Copyright (c) 2014-2024 Simon Fraser University
+  * Copyright (c) 2003-2024 John Willinsky
   * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING.
   *
   * Installation descriptor file.
@@ -39,6 +39,8 @@
 	<migration class="PKP\migration\install\TombstoneMigration" />
 	<migration class="PKP\migration\install\DoiMigration" />
 	<migration class="PKP\migration\install\InstitutionsMigration" />
+	<migration class="PKP\migration\install\AffiliationsMigration" />
+	<migration class="PKP\migration\install\RorsMigration" />
 
 	<migration class="APP\migration\install\OJSMigration" />
 
diff --git a/dbscripts/xml/upgrade.xml b/dbscripts/xml/upgrade.xml
index ac0540c3f13..b8687c39b76 100644
--- a/dbscripts/xml/upgrade.xml
+++ b/dbscripts/xml/upgrade.xml
@@ -3,8 +3,8 @@
 <!--
   * dbscripts/xml/upgrade.xml
   *
-  * Copyright (c) 2014-2021 Simon Fraser University
-  * Copyright (c) 2003-2021 John Willinsky
+  * Copyright (c) 2014-2024 Simon Fraser University
+  * Copyright (c) 2003-2024 John Willinsky
   * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING.
   *
   * Upgrade descriptor file.
@@ -159,6 +159,8 @@
 		<migration class="PKP\migration\upgrade\v3_5_0\FilterClassNames"/>
 		<migration class="APP\migration\upgrade\v3_5_0\I10620_EditorialBoardMemberRole"/>
 		<migration class="APP\migration\upgrade\v3_5_0\I9707_WeblateUILocales"/>
+		<migration class="PKP\migration\upgrade\v3_5_0\I7135_CreateAuthorAffiliationsTables"/>
+		<migration class="PKP\migration\upgrade\v3_5_0\I7135_CreateNewRorRegistryCacheTables"/>
 		<note file="docs/release-notes/README-3.5.0" />
 	</upgrade>
 
diff --git a/pages/article/ArticleHandler.php b/pages/article/ArticleHandler.php
index fbfaa8eb28e..a7c7339dad9 100644
--- a/pages/article/ArticleHandler.php
+++ b/pages/article/ArticleHandler.php
@@ -3,8 +3,8 @@
 /**
  * @file pages/article/ArticleHandler.php
  *
- * Copyright (c) 2014-2021 Simon Fraser University
- * Copyright (c) 2003-2021 John Willinsky
+ * Copyright (c) 2014-2024 Simon Fraser University
+ * Copyright (c) 2003-2024 John Willinsky
  * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING.
  *
  * @class ArticleHandler
@@ -361,6 +361,13 @@ public function view($args, $request)
                 $templateMgr->assign('purchaseArticleEnabled', true);
             }
 
+            // ror icon
+            $rorIdIcon = 'ROR';
+            if (file_exists('lib/pkp/templates/images/ror.svg')) {
+                $rorIdIcon = file_get_contents('lib/pkp/templates/images/ror.svg');
+            }
+            $templateMgr->assign('rorIdIcon', $rorIdIcon);
+
             if (!Hook::call('ArticleHandler::view', [&$request, &$issue, &$article, $publication])) {
                 $templateMgr->display('frontend/pages/article.tpl');
                 event(new UsageEvent(Application::ASSOC_TYPE_SUBMISSION, $context, $article, null, null, $this->issue));
diff --git a/plugins/generic/datacite/filter/DataciteXmlFilter.php b/plugins/generic/datacite/filter/DataciteXmlFilter.php
index 9ebe19a7819..c4cce3d77f9 100644
--- a/plugins/generic/datacite/filter/DataciteXmlFilter.php
+++ b/plugins/generic/datacite/filter/DataciteXmlFilter.php
@@ -3,8 +3,8 @@
 /**
  * @file plugins/generic/datacite/filter/DataciteXmlFilter.php
  *
- * Copyright (c) 2014-2021 Simon Fraser University
- * Copyright (c) 2000-2021 John Willinsky
+ * Copyright (c) 2014-2024 Simon Fraser University
+ * Copyright (c) 2000-2024 John Willinsky
  * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING.
  *
  * @class DataciteXmlFilter
@@ -297,8 +297,7 @@ public function createCreatorsNode(DOMDocument $doc, Issue $issue, Publication $
                     $creators[] = [
                         'name' => $creator,
                         'orcid' => null,
-                        'affiliation' => null,
-                        'ror' => null
+                        'affiliations' => null
                     ];
                     break;
                 }
@@ -312,8 +311,7 @@ public function createCreatorsNode(DOMDocument $doc, Issue $issue, Publication $
                     $creators[] = [
                         'name' => $author->getFullName(false, true, $publication->getData('locale')),
                         'orcid' => $author->getData('orcidIsVerified') ? $author->getData('orcid') : null,
-                        'affiliation' => $author->getLocalizedData('affiliation', $publication->getData('locale')),
-                        'ror' => $author->getData('rorId') ?? null
+                        'affiliations' => $author->getAffiliations()
                     ];
                 }
                 break;
@@ -321,8 +319,7 @@ public function createCreatorsNode(DOMDocument $doc, Issue $issue, Publication $
                 $creators[] = [
                     'name' => $publisher,
                     'orcid' => null,
-                    'affiliation' => null,
-                    'ror' => null
+                    'affiliations' => null
                 ];
                 break;
         }
@@ -338,15 +335,17 @@ public function createCreatorsNode(DOMDocument $doc, Issue $issue, Publication $
                 $node->setAttribute('nameIdentifierScheme', 'ORCID');
                 $creatorNode->appendChild($node);
             }
-            if ($creator['affiliation']) {
-                $node = $doc->createElementNS($deployment->getNamespace(), 'affiliation');
-                if ($creator['ror']) {
-                    $node->setAttribute('affiliationIdentifier', $creator['ror']);
-                    $node->setAttribute('affiliationIdentifierScheme', 'ROR');
-                    $node->setAttribute('schemeURI', 'https://ror.org');
+            if ($creator['affiliations']) {
+                foreach($creator['affiliations'] as $affiliation) {
+                    $node = $doc->createElementNS($deployment->getNamespace(), 'affiliation');
+                    if ($affiliation['ror']) {
+                        $node->setAttribute('affiliationIdentifier', $affiliation['ror']);
+                        $node->setAttribute('affiliationIdentifierScheme', 'ROR');
+                        $node->setAttribute('schemeURI', 'https://ror.org');
+                    }
+                    $node->appendChild($doc->createTextNode($affiliation['name']));
+                    $creatorNode->appendChild($node);
                 }
-                $node->appendChild($doc->createTextNode($creator['affiliation']));
-                $creatorNode->appendChild($node);
             }
             $creatorsNode->appendChild($creatorNode);
         }
diff --git a/plugins/importexport/doaj/filter/DOAJJsonFilter.php b/plugins/importexport/doaj/filter/DOAJJsonFilter.php
index 151878cd45d..9b59b7772c4 100644
--- a/plugins/importexport/doaj/filter/DOAJJsonFilter.php
+++ b/plugins/importexport/doaj/filter/DOAJJsonFilter.php
@@ -3,8 +3,8 @@
 /**
  * @file plugins/importexport/doaj/filter/DOAJJsonFilter.php
  *
- * Copyright (c) 2014-2021 Simon Fraser University
- * Copyright (c) 2000-2021 John Willinsky
+ * Copyright (c) 2014-2024 Simon Fraser University
+ * Copyright (c) 2000-2024 John Willinsky
  * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING.
  *
  * @class DOAJJsonFilter
@@ -158,9 +158,9 @@ public function &process(&$pubObject)
 
             foreach ($articleAuthors as $articleAuthor) {
                 $author = ['name' => $articleAuthor->getFullName(false, false, $publicationLocale)];
-                $affiliation = $articleAuthor->getAffiliation($publicationLocale);
-                if (!empty($affiliation)) {
-                    $author['affiliation'] = $affiliation;
+                $affiliations = $articleAuthor->getLocalizedAffiliationNamesAsString($publicationLocale);
+                if (!empty($affiliations)) {
+                    $author['affiliations'] = $affiliations;
                 }
                 if ($articleAuthor->getData('orcid') && $articleAuthor->getData('orcidIsVerified')) {
                     $author['orcid_id'] = $articleAuthor->getData('orcid');
diff --git a/plugins/importexport/doaj/filter/DOAJXmlFilter.php b/plugins/importexport/doaj/filter/DOAJXmlFilter.php
index 7a2fad5357c..ec5a6040627 100644
--- a/plugins/importexport/doaj/filter/DOAJXmlFilter.php
+++ b/plugins/importexport/doaj/filter/DOAJXmlFilter.php
@@ -3,8 +3,8 @@
 /**
  * @file plugins/importexport/doaj/filter/DOAJXmlFilter.php
  *
- * Copyright (c) 2014-2022 Simon Fraser University
- * Copyright (c) 2000-2022 John Willinsky
+ * Copyright (c) 2014-2024 Simon Fraser University
+ * Copyright (c) 2000-2024 John Willinsky
  * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING.
  *
  * @class DOAJXmlFilter
@@ -248,8 +248,15 @@ public function createAuthorNode($doc, $publication, $author, $affilList)
         $deployment = $this->getDeployment();
         $authorNode = $doc->createElement('author');
         $authorNode->appendChild($node = $doc->createElement('name', htmlspecialchars($author->getFullName(false, false, $publication->getData('locale')), ENT_COMPAT, 'UTF-8')));
-        if (in_array($author->getAffiliation($publication->getData('locale')), $affilList) && !empty($affilList[0])) {
-            $authorNode->appendChild($node = $doc->createElement('affiliationId', htmlspecialchars(current(array_keys($affilList, $author->getAffiliation($publication->getData('locale')))), ENT_COMPAT, 'UTF-8')));
+        $affiliations = $author->getLocalizedAffiliationNames($publication->getData('locale'));
+        foreach ($affiliations as $affiliation) {
+            if (in_array($affiliation, $affilList) && !empty($affilList[0])) {
+                $authorNode->appendChild(
+                    $node = $doc->createElement('affiliationId',
+                        htmlspecialchars(current(array_keys($affilList, $affiliation)), ENT_COMPAT, 'UTF-8')
+                    )
+                );
+            }
         }
         if ($author->getData('orcid') && $author->getData('orcidIsVerified')) {
             $authorNode->appendChild($doc->createElement('orcid_id'))->appendChild($doc->createTextNode($author->getData('orcid')));
@@ -269,8 +276,11 @@ public function createAffiliationsList($authors, $publication)
     {
         $affilList = [];
         foreach ($authors as $author) {
-            if (!in_array($author->getAffiliation($publication->getData('locale')), $affilList)) {
-                $affilList[] = $author->getAffiliation($publication->getData('locale')) ;
+            $affiliations = $author->getLocalizedAffiliationNames($publication->getData('locale'));
+            foreach ($affiliations as $affiliation) {
+                if (!in_array($affiliation, $affilList)) {
+                    $affilList[] = $affiliation;;
+                }
             }
         }
         return $affilList;
diff --git a/plugins/importexport/pubmed/filter/ArticlePubMedXmlFilter.php b/plugins/importexport/pubmed/filter/ArticlePubMedXmlFilter.php
index efa34b0b39d..9dc1b59f9e1 100644
--- a/plugins/importexport/pubmed/filter/ArticlePubMedXmlFilter.php
+++ b/plugins/importexport/pubmed/filter/ArticlePubMedXmlFilter.php
@@ -3,8 +3,8 @@
 /**
  * @file plugins/importexport/pubmed/filter/ArticlePubMedXmlFilter.php
  *
- * Copyright (c) 2014-2021 Simon Fraser University
- * Copyright (c) 2000-2021 John Willinsky
+ * Copyright (c) 2014-2024 Simon Fraser University
+ * Copyright (c) 2000-2024 John Willinsky
  * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING.
  *
  * @class ArticlePubMedXmlFilter
@@ -215,8 +215,15 @@ public function generateAuthorNode($doc, $journal, $issue, $submission, $author)
             $authorElement->appendChild($doc->createElement('FirstName'))->appendChild($doc->createTextNode(ucfirst($author->getLocalizedGivenName())));
             $authorElement->appendChild($doc->createElement('LastName'))->appendChild($doc->createTextNode(ucfirst($author->getLocalizedFamilyName())));
         }
-        $authorElement->appendChild($doc->createElement('Affiliation'))->appendChild($doc->createTextNode($author->getLocalizedAffiliation()));
-
+        foreach ($author->getAffiliations() as $affiliation) {
+            $affiliationInfoElement = $doc->createElement('AffiliationInfo');
+            $affiliationInfoElement->appendChild($doc->createElement('Affiliation'))->appendChild($doc->createTextNode($affiliation->getLocalizedName()));
+            if ($affiliation->getRor()) {
+                $affiliationInfoElement->appendChild($identifierNode = $doc->createElement('Identifier'))->appendChild($doc->createTextNode($affiliation->getRor()));
+                $identifierNode->setAttribute('Source', 'ROR');
+            }
+            $authorElement->appendChild($affiliationInfoElement);
+        }
         if ($author->getData('orcid') && $author->getData('orcidIsVerified')) {
             // We're storing the ORCID with a URL (http://orcid.org/{$ID}), but the XML expects just the ID
             $orcidId = explode('/', trim($author->getData('orcid') ?? '', '/'));
diff --git a/plugins/oaiMetadataFormats/dc/tests/OAIMetadataFormat_DCTest.php b/plugins/oaiMetadataFormats/dc/tests/OAIMetadataFormat_DCTest.php
index a6e53f1b5cf..45e7c744743 100755
--- a/plugins/oaiMetadataFormats/dc/tests/OAIMetadataFormat_DCTest.php
+++ b/plugins/oaiMetadataFormats/dc/tests/OAIMetadataFormat_DCTest.php
@@ -7,8 +7,8 @@
 /**
  * @file plugins/oaiMetadataFormats/dc/tests/OAIMetadataFormat_DCTest.php
  *
- * Copyright (c) 2014-2021 Simon Fraser University
- * Copyright (c) 2000-2021 John Willinsky
+ * Copyright (c) 2014-2024 Simon Fraser University
+ * Copyright (c) 2000-2024 John Willinsky
  * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING.
  *
  * @class OAIMetadataFormat_DCTest
@@ -102,7 +102,14 @@ public function testToXml()
         $author = new Author();
         $author->setGivenName('author-firstname', 'en');
         $author->setFamilyName('author-lastname', 'en');
-        $author->setAffiliation('author-affiliation', 'en');
+        $author->setAffiliations([
+            Repo::affiliation()->newDataObject([
+                "id" => 1,
+                "authorId" => 1,
+                "ror" => 'https://ror.org/05ek4tb53',
+                "name" => ['en' => 'author-affiliation']
+            ])
+        ]);
         $author->setEmail('someone@example.com');
 
         // Publication
diff --git a/plugins/oaiMetadataFormats/marc/templates/record.tpl b/plugins/oaiMetadataFormats/marc/templates/record.tpl
index ccacad97be4..3c254b7e3ef 100644
--- a/plugins/oaiMetadataFormats/marc/templates/record.tpl
+++ b/plugins/oaiMetadataFormats/marc/templates/record.tpl
@@ -34,8 +34,10 @@
 	{foreach from=$authors item=author}
 		<varfield id="{if $authors|@count==1}100{else}720{/if}" i1="1" i2=" ">
 			<subfield label="a">{$author->getFullName(false, true, $journal->getPrimaryLocale())|escape}</subfield>
-			{assign var=affiliation value=$author->getAffiliation($journal->getPrimaryLocale())}
-			{if $affiliation}<subfield label="u">{$affiliation|escape}</subfield>{/if}
+			{foreach from=$author->getLocalizedAffiliations() item=$affiliation}
+			{if $affiliation['ror']}<subfield code="u">{$affiliation['ror']|escape}</subfield>
+			{elseif $affiliation['name']}<subfield code="u">{$affiliation['name']|escape}</subfield>{/if}
+			{/foreach}
 			{if $author->getUrl()}<subfield label="0">{$author->getUrl()|escape}</subfield>{/if}
 			{if $author->getData('orcid') && $author->getData('orcidIsVerified')}<subfield label="0">{$author->getData('orcid')|escape}</subfield>{/if}
 		</varfield>
diff --git a/plugins/oaiMetadataFormats/marcxml/templates/record.tpl b/plugins/oaiMetadataFormats/marcxml/templates/record.tpl
index 023f0e4a582..bee5b42358d 100644
--- a/plugins/oaiMetadataFormats/marcxml/templates/record.tpl
+++ b/plugins/oaiMetadataFormats/marcxml/templates/record.tpl
@@ -43,8 +43,10 @@
 	{foreach from=$authors item=author}
 		<datafield tag="{if $authors|@count==1}100{else}720{/if}" ind1="1" ind2=" ">
 			<subfield code="a">{$author->getFullName(false, true, $journal->getPrimaryLocale())|escape}</subfield>
-			{assign var=affiliation value=$author->getAffiliation($journal->getPrimaryLocale())}
-			{if $affiliation}<subfield code="u">{$affiliation|escape}</subfield>{/if}
+			{foreach from=$author->getLocalizedAffiliations() item=$affiliation}
+			{if $affiliation['ror']}<subfield code="u">{$affiliation['ror']|escape}</subfield>
+			{elseif $affiliation['name']}<subfield code="u">{$affiliation['name']|escape}</subfield>{/if}
+			{/foreach}
 			{if $author->getUrl()}<subfield code="0">{$author->getUrl()|escape}</subfield>{/if}
 			{if $author->getData('orcid') && $author->getData('orcidIsVerified')}<subfield code="0">{$author->getData('orcid')|escape}</subfield>{/if}
 		</datafield>
diff --git a/plugins/oaiMetadataFormats/rfc1807/OAIMetadataFormat_RFC1807.php b/plugins/oaiMetadataFormats/rfc1807/OAIMetadataFormat_RFC1807.php
index f99f794dc0a..b391e8e39b7 100644
--- a/plugins/oaiMetadataFormats/rfc1807/OAIMetadataFormat_RFC1807.php
+++ b/plugins/oaiMetadataFormats/rfc1807/OAIMetadataFormat_RFC1807.php
@@ -66,13 +66,8 @@ public function toXml($record, $format = null)
 
         // Format creators
         $creators = [];
-        foreach ($publication->getData('authors') as $author) {
-            $authorName = $author->getFullName(false, true);
-            $affiliation = $author->getLocalizedAffiliation();
-            if (!empty($affiliation)) {
-                $authorName .= '; ' . $affiliation;
-            }
-            $creators[] = $authorName;
+        foreach ($publication->getAuthors() as $author) {
+            $creators[] = $author->getFullName(false, true);
         }
 
         $subjects = array_merge_recursive(
diff --git a/plugins/reports/articles/ArticleReportPlugin.php b/plugins/reports/articles/ArticleReportPlugin.php
index 77cf9cdf73a..8321ea0f216 100644
--- a/plugins/reports/articles/ArticleReportPlugin.php
+++ b/plugins/reports/articles/ArticleReportPlugin.php
@@ -3,8 +3,8 @@
 /**
  * @file plugins/reports/articles/ArticleReportPlugin.php
  *
- * Copyright (c) 2014-2021 Simon Fraser University
- * Copyright (c) 2003-2021 John Willinsky
+ * Copyright (c) 2014-2024 Simon Fraser University
+ * Copyright (c) 2003-2024 John Willinsky
  * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING.
  *
  * @class ArticleReportPlugin
@@ -186,7 +186,7 @@ public function display($args, $request)
                         $author->getLocalizedFamilyName(),
                         $author->getData('orcid'),
                         $author->getData('country'),
-                        $author->getLocalizedData('affiliation'),
+                        $author->getLocalizedAffiliationNamesAsString(),
                         $author->getData('email'),
                         $author->getData('url'),
                         html_entity_decode(strip_tags($author->getLocalizedData('biography'))),
diff --git a/templates/frontend/objects/article_details.tpl b/templates/frontend/objects/article_details.tpl
index 698a04a2e3c..58ce8901382 100755
--- a/templates/frontend/objects/article_details.tpl
+++ b/templates/frontend/objects/article_details.tpl
@@ -1,8 +1,8 @@
 {**
  * templates/frontend/objects/article_details.tpl
  *
- * Copyright (c) 2014-2021 Simon Fraser University
- * Copyright (c) 2003-2021 John Willinsky
+ * Copyright (c) 2014-2024 Simon Fraser University
+ * Copyright (c) 2003-2024 John Willinsky
  * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING.
  *
  * @brief View of an Article which displays all details about the article.
@@ -113,13 +113,13 @@
 							<span class="name">
 								{$author->getFullName()|escape}
 							</span>
-							{if $author->getLocalizedData('affiliation')}
+							{if $author->getLocalizedAffiliations()}
+							{foreach $author->getLocalizedAffiliations() as $affiliation}
 								<span class="affiliation">
-									{$author->getLocalizedData('affiliation')|escape}
-									{if $author->getData('rorId')}
-										<a href="{$author->getData('rorId')|escape}">{$rorIdIcon}</a>
-									{/if}
-								</span>
+								{$affiliation['name']|escape}
+								{if $affiliation['ror']}<a href="{$affiliation['ror']|escape}">{$rorIdIcon}</a>{/if}
+								</span><br/>
+							{/foreach}
 							{/if}
 							{assign var=authorUserGroup value=$userGroupsById[$author->getData('userGroupId')]}
 							{if $authorUserGroup->showTitle}
@@ -225,13 +225,13 @@
 						{if $author->getLocalizedData('biography')}
 							<li class="sub_item">
 								<div class="label">
-									{if $author->getLocalizedData('affiliation')}
-										{capture assign="authorName"}{$author->getFullName()|escape}{/capture}
-										{capture assign="authorAffiliation"} {$author->getLocalizedData('affiliation')|escape} {/capture}
-										{translate key="submission.authorWithAffiliation" name=$authorName affiliation=$authorAffiliation}
-									{else}
-										{$author->getFullName()|escape}
-									{/if}
+								{if $author->getLocalizedAffiliationNamesAsString()}
+									{capture assign="authorName"}{$author->getFullName()|escape}{/capture}
+									{capture assign="authorAffiliations"} {$author->getLocalizedAffiliationNamesAsString()|escape} {/capture}
+									{translate key="submission.authorWithAffiliation" name=$authorName affiliation=$authorAffiliations}
+								{else}
+									{$author->getFullName()|escape}
+								{/if}
 								</div>
 								<div class="value">
 									{$author->getLocalizedData('biography')|strip_unsafe_html}

From 8eaab56f567ad1daa21261deb2bfab4b65576d52 Mon Sep 17 00:00:00 2001
From: Bozana Bokan <bozana.bokan@posteo.net>
Date: Wed, 5 Feb 2025 13:12:45 +0100
Subject: [PATCH 2/3] pkp/pkp-lib#7135 Multiple author affiliations (Ror) -
 changes and fixes

---
 api/v1/rors/index.php                         |  4 +--
 .../60-content/CmontgomerieSubmission.cy.js   | 10 ++++--
 .../data/60-content/EostromSubmission.cy.js   | 10 ++++--
 .../60-content/KalkhafajiSubmission.cy.js     | 10 ++++--
 dbscripts/xml/install.xml                     |  5 +--
 dbscripts/xml/upgrade.xml                     |  4 +--
 pages/article/ArticleHandler.php              | 16 +++++-----
 .../datacite/filter/DataciteXmlFilter.php     | 14 +++++----
 .../doaj/filter/DOAJJsonFilter.php            |  4 +--
 .../doaj/filter/DOAJXmlFilter.php             | 20 ++++++------
 plugins/importexport/native/README.md         |  4 +--
 .../pubmed/filter/ArticlePubMedXmlFilter.php  |  4 +--
 .../dc/tests/OAIMetadataFormat_DCTest.php     | 12 +++----
 .../marc/templates/record.tpl                 | 10 +++---
 .../marcxml/templates/record.tpl              | 10 +++---
 .../rfc1807/OAIMetadataFormat_RFC1807.php     |  6 ++--
 .../reports/articles/ArticleReportPlugin.php  |  4 +--
 .../styles/objects/article_details.less       |  4 +++
 .../frontend/objects/article_details.tpl      | 31 ++++++++++---------
 19 files changed, 100 insertions(+), 82 deletions(-)

diff --git a/api/v1/rors/index.php b/api/v1/rors/index.php
index 4da33b61f85..27a9d1f4da6 100644
--- a/api/v1/rors/index.php
+++ b/api/v1/rors/index.php
@@ -7,8 +7,8 @@
 /**
  * @file api/v1/rors/index.php
  *
- * Copyright (c) 2024 Simon Fraser University
- * Copyright (c) 2024 John Willinsky
+ * Copyright (c) 2025 Simon Fraser University
+ * Copyright (c) 2025 John Willinsky
  * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING.
  *
  * @ingroup api_v1_rors
diff --git a/cypress/tests/data/60-content/CmontgomerieSubmission.cy.js b/cypress/tests/data/60-content/CmontgomerieSubmission.cy.js
index 2884a08ff78..f9b01433c4e 100644
--- a/cypress/tests/data/60-content/CmontgomerieSubmission.cy.js
+++ b/cypress/tests/data/60-content/CmontgomerieSubmission.cy.js
@@ -1,8 +1,8 @@
 /**
  * @file cypress/tests/data/60-content/CmontgomerieSubmission.cy.js
  *
- * Copyright (c) 2014-2021 Simon Fraser University
- * Copyright (c) 2000-2021 John Willinsky
+ * Copyright (c) 2014-2025 Simon Fraser University
+ * Copyright (c) 2000-2025 John Willinsky
  * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING.
  *
  */
@@ -28,7 +28,11 @@ describe('Data suite: Cmontgomerie', function() {
 			{
 				givenName: {en: 'Mark'},
 				familyName: {en: 'Irvine'},
-				affiliation: {en: 'University of Victoria'},
+				affiliations: [
+					{
+						name: {en: 'University of Victoria'}
+					}
+				],
 				email: 'mirvine@mailinator.com',
 				country: 'CA',
 				userGroupId: Cypress.env('authorUserGroupId')
diff --git a/cypress/tests/data/60-content/EostromSubmission.cy.js b/cypress/tests/data/60-content/EostromSubmission.cy.js
index 3ab7bbd4d2a..7426c2888fc 100644
--- a/cypress/tests/data/60-content/EostromSubmission.cy.js
+++ b/cypress/tests/data/60-content/EostromSubmission.cy.js
@@ -1,8 +1,8 @@
 /**
  * @file cypress/tests/data/60-content/EostromSubmission.cy.js
  *
- * Copyright (c) 2014-2021 Simon Fraser University
- * Copyright (c) 2000-2021 John Willinsky
+ * Copyright (c) 2014-2025 Simon Fraser University
+ * Copyright (c) 2000-2025 John Willinsky
  * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING.
  *
  */
@@ -24,7 +24,11 @@ describe('Data suite tests', function() {
 			{
 				givenName: {en: 'Frank'},
 				familyName: {en: 'van Laerhoven'},
-				affiliation: {en: 'Indiana University'},
+				affiliations: [
+					{
+						name: {en: 'Indiana University'}
+					}
+				],
 				email: 'fvanlaerhoven@mailinator.com',
 				country: 'US',
 				userGroupId: Cypress.env('authorUserGroupId')
diff --git a/cypress/tests/data/60-content/KalkhafajiSubmission.cy.js b/cypress/tests/data/60-content/KalkhafajiSubmission.cy.js
index 4964374ffe6..cbecd8e5577 100644
--- a/cypress/tests/data/60-content/KalkhafajiSubmission.cy.js
+++ b/cypress/tests/data/60-content/KalkhafajiSubmission.cy.js
@@ -1,8 +1,8 @@
 /**
  * @file cypress/tests/data/60-content/KalkhafajiSubmission.cy.js
  *
- * Copyright (c) 2014-2021 Simon Fraser University
- * Copyright (c) 2000-2021 John Willinsky
+ * Copyright (c) 2014-2025 Simon Fraser University
+ * Copyright (c) 2000-2025 John Willinsky
  * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING.
  *
  */
@@ -25,7 +25,11 @@ describe('Data suite tests', function() {
 			{
 				givenName: {en: 'Margaret'},
 				familyName: {en: 'Morse'},
-				affiliation: {en: 'Stanford University'},
+				affiliations: [
+					{
+						name: {en: 'Stanford University'}
+					}
+				],
 				email: 'mmorse@mailinator.com',
 				country: 'US',
 				userGroupId: Cypress.env('authorUserGroupId')
diff --git a/dbscripts/xml/install.xml b/dbscripts/xml/install.xml
index 87c8ef78b9b..2642510df82 100644
--- a/dbscripts/xml/install.xml
+++ b/dbscripts/xml/install.xml
@@ -3,8 +3,8 @@
 <!--
   * dbscripts/xml/install.xml
   *
-  * Copyright (c) 2014-2024 Simon Fraser University
-  * Copyright (c) 2003-2024 John Willinsky
+  * Copyright (c) 2014-2025 Simon Fraser University
+  * Copyright (c) 2003-2025 John Willinsky
   * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING.
   *
   * Installation descriptor file.
@@ -55,4 +55,5 @@
 	<code function="createConfig"/>
 	<code function="addPluginVersions"/>
 	<code function="installDefaultNavigationMenus"/>
+	<code function="updateRorRegistryDataset"/>
 </install>
diff --git a/dbscripts/xml/upgrade.xml b/dbscripts/xml/upgrade.xml
index b8687c39b76..8f3dff58852 100644
--- a/dbscripts/xml/upgrade.xml
+++ b/dbscripts/xml/upgrade.xml
@@ -3,8 +3,8 @@
 <!--
   * dbscripts/xml/upgrade.xml
   *
-  * Copyright (c) 2014-2024 Simon Fraser University
-  * Copyright (c) 2003-2024 John Willinsky
+  * Copyright (c) 2014-2025 Simon Fraser University
+  * Copyright (c) 2003-2025 John Willinsky
   * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING.
   *
   * Upgrade descriptor file.
diff --git a/pages/article/ArticleHandler.php b/pages/article/ArticleHandler.php
index a7c7339dad9..dbb47bc0b35 100644
--- a/pages/article/ArticleHandler.php
+++ b/pages/article/ArticleHandler.php
@@ -3,8 +3,8 @@
 /**
  * @file pages/article/ArticleHandler.php
  *
- * Copyright (c) 2014-2024 Simon Fraser University
- * Copyright (c) 2003-2024 John Willinsky
+ * Copyright (c) 2014-2025 Simon Fraser University
+ * Copyright (c) 2003-2025 John Willinsky
  * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING.
  *
  * @class ArticleHandler
@@ -30,6 +30,7 @@
 use Firebase\JWT\Key;
 use PKP\citation\CitationDAO;
 use PKP\config\Config;
+use PKP\core\Core;
 use PKP\core\PKPApplication;
 use PKP\core\PKPJwt as JWT;
 use PKP\db\DAORegistry;
@@ -301,6 +302,9 @@ public function view($args, $request)
             ]);
         }
 
+        $rorIconPath = Core::getBaseDir() . '/' . PKP_LIB_PATH . '/templates/images/ror.svg';
+        $rorIdIcon = file_exists($rorIconPath) ? file_get_contents($rorIconPath) : '';
+
         // Assign deprecated values to the template manager for
         // compatibility with older themes
         $templateMgr->assign([
@@ -312,6 +316,7 @@ public function view($args, $request)
             'keywords' => $publication->getData('keywords'),
             'orcidIcon' => OrcidManager::getIcon(),
             'orcidUnauthenticatedIcon' => OrcidManager::getUnauthenticatedIcon(),
+            'rorIdIcon' => $rorIdIcon
         ]);
 
         // Fetch and assign the galley to the template
@@ -361,13 +366,6 @@ public function view($args, $request)
                 $templateMgr->assign('purchaseArticleEnabled', true);
             }
 
-            // ror icon
-            $rorIdIcon = 'ROR';
-            if (file_exists('lib/pkp/templates/images/ror.svg')) {
-                $rorIdIcon = file_get_contents('lib/pkp/templates/images/ror.svg');
-            }
-            $templateMgr->assign('rorIdIcon', $rorIdIcon);
-
             if (!Hook::call('ArticleHandler::view', [&$request, &$issue, &$article, $publication])) {
                 $templateMgr->display('frontend/pages/article.tpl');
                 event(new UsageEvent(Application::ASSOC_TYPE_SUBMISSION, $context, $article, null, null, $this->issue));
diff --git a/plugins/generic/datacite/filter/DataciteXmlFilter.php b/plugins/generic/datacite/filter/DataciteXmlFilter.php
index c4cce3d77f9..6c413091810 100644
--- a/plugins/generic/datacite/filter/DataciteXmlFilter.php
+++ b/plugins/generic/datacite/filter/DataciteXmlFilter.php
@@ -3,8 +3,8 @@
 /**
  * @file plugins/generic/datacite/filter/DataciteXmlFilter.php
  *
- * Copyright (c) 2014-2024 Simon Fraser University
- * Copyright (c) 2000-2024 John Willinsky
+ * Copyright (c) 2014-2025 Simon Fraser University
+ * Copyright (c) 2000-2025 John Willinsky
  * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING.
  *
  * @class DataciteXmlFilter
@@ -336,14 +336,16 @@ public function createCreatorsNode(DOMDocument $doc, Issue $issue, Publication $
                 $creatorNode->appendChild($node);
             }
             if ($creator['affiliations']) {
-                foreach($creator['affiliations'] as $affiliation) {
+                // Currently affiliations are only there for Publication objects
+                foreach ($creator['affiliations'] as $affiliation) {
                     $node = $doc->createElementNS($deployment->getNamespace(), 'affiliation');
-                    if ($affiliation['ror']) {
-                        $node->setAttribute('affiliationIdentifier', $affiliation['ror']);
+                    $ror = $affiliation->getRor();
+                    if ($ror) {
+                        $node->setAttribute('affiliationIdentifier', $ror);
                         $node->setAttribute('affiliationIdentifierScheme', 'ROR');
                         $node->setAttribute('schemeURI', 'https://ror.org');
                     }
-                    $node->appendChild($doc->createTextNode($affiliation['name']));
+                    $node->appendChild($doc->createTextNode($affiliation->getLocalizedName($publication->getData('locale'))));
                     $creatorNode->appendChild($node);
                 }
             }
diff --git a/plugins/importexport/doaj/filter/DOAJJsonFilter.php b/plugins/importexport/doaj/filter/DOAJJsonFilter.php
index 9b59b7772c4..d53aadbeafe 100644
--- a/plugins/importexport/doaj/filter/DOAJJsonFilter.php
+++ b/plugins/importexport/doaj/filter/DOAJJsonFilter.php
@@ -3,8 +3,8 @@
 /**
  * @file plugins/importexport/doaj/filter/DOAJJsonFilter.php
  *
- * Copyright (c) 2014-2024 Simon Fraser University
- * Copyright (c) 2000-2024 John Willinsky
+ * Copyright (c) 2014-2025 Simon Fraser University
+ * Copyright (c) 2000-2025 John Willinsky
  * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING.
  *
  * @class DOAJJsonFilter
diff --git a/plugins/importexport/doaj/filter/DOAJXmlFilter.php b/plugins/importexport/doaj/filter/DOAJXmlFilter.php
index ec5a6040627..9d9f1e4d736 100644
--- a/plugins/importexport/doaj/filter/DOAJXmlFilter.php
+++ b/plugins/importexport/doaj/filter/DOAJXmlFilter.php
@@ -3,8 +3,8 @@
 /**
  * @file plugins/importexport/doaj/filter/DOAJXmlFilter.php
  *
- * Copyright (c) 2014-2024 Simon Fraser University
- * Copyright (c) 2000-2024 John Willinsky
+ * Copyright (c) 2014-2025 Simon Fraser University
+ * Copyright (c) 2000-2025 John Willinsky
  * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING.
  *
  * @class DOAJXmlFilter
@@ -250,13 +250,12 @@ public function createAuthorNode($doc, $publication, $author, $affilList)
         $authorNode->appendChild($node = $doc->createElement('name', htmlspecialchars($author->getFullName(false, false, $publication->getData('locale')), ENT_COMPAT, 'UTF-8')));
         $affiliations = $author->getLocalizedAffiliationNames($publication->getData('locale'));
         foreach ($affiliations as $affiliation) {
-            if (in_array($affiliation, $affilList) && !empty($affilList[0])) {
-                $authorNode->appendChild(
-                    $node = $doc->createElement('affiliationId',
-                        htmlspecialchars(current(array_keys($affilList, $affiliation)), ENT_COMPAT, 'UTF-8')
-                    )
-                );
-            }
+            $authorNode->appendChild(
+                $doc->createElement(
+                    'affiliationId',
+                    htmlspecialchars(current(array_keys($affilList, $affiliation)), ENT_COMPAT, 'UTF-8')
+                )
+            );
         }
         if ($author->getData('orcid') && $author->getData('orcidIsVerified')) {
             $authorNode->appendChild($doc->createElement('orcid_id'))->appendChild($doc->createTextNode($author->getData('orcid')));
@@ -279,7 +278,8 @@ public function createAffiliationsList($authors, $publication)
             $affiliations = $author->getLocalizedAffiliationNames($publication->getData('locale'));
             foreach ($affiliations as $affiliation) {
                 if (!in_array($affiliation, $affilList)) {
-                    $affilList[] = $affiliation;;
+                    $affilList[] = $affiliation;
+                    ;
                 }
             }
         }
diff --git a/plugins/importexport/native/README.md b/plugins/importexport/native/README.md
index 447f1af0161..c87f55a303d 100644
--- a/plugins/importexport/native/README.md
+++ b/plugins/importexport/native/README.md
@@ -7,5 +7,5 @@ for documentation.
 
 ## Sample XML
 
-Sample XML can be found in https://github.com/pkp/ojs/blob/[tag]/cypress/fixtures/export-issues.xml,
-where [tag] indicates your version of OJS, e.g.: 3_2_1-0 for OJS 3.1.2-0.
+Sample XML can be found in https://github.com/pkp/datasets/blob/main/omp/[branch]/mysql/native-export-sample.xml,
+where [branch] indicates the GitHub repository branch name of your OMP version, e.g.: stable-3_3_0 for OJS 3.3.0-x, stable-3_4_0 for OJS 3.4.0-x.
diff --git a/plugins/importexport/pubmed/filter/ArticlePubMedXmlFilter.php b/plugins/importexport/pubmed/filter/ArticlePubMedXmlFilter.php
index 9dc1b59f9e1..cd2ab1d6de9 100644
--- a/plugins/importexport/pubmed/filter/ArticlePubMedXmlFilter.php
+++ b/plugins/importexport/pubmed/filter/ArticlePubMedXmlFilter.php
@@ -3,8 +3,8 @@
 /**
  * @file plugins/importexport/pubmed/filter/ArticlePubMedXmlFilter.php
  *
- * Copyright (c) 2014-2024 Simon Fraser University
- * Copyright (c) 2000-2024 John Willinsky
+ * Copyright (c) 2014-2025 Simon Fraser University
+ * Copyright (c) 2000-2025 John Willinsky
  * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING.
  *
  * @class ArticlePubMedXmlFilter
diff --git a/plugins/oaiMetadataFormats/dc/tests/OAIMetadataFormat_DCTest.php b/plugins/oaiMetadataFormats/dc/tests/OAIMetadataFormat_DCTest.php
index 45e7c744743..4794447c198 100755
--- a/plugins/oaiMetadataFormats/dc/tests/OAIMetadataFormat_DCTest.php
+++ b/plugins/oaiMetadataFormats/dc/tests/OAIMetadataFormat_DCTest.php
@@ -7,8 +7,8 @@
 /**
  * @file plugins/oaiMetadataFormats/dc/tests/OAIMetadataFormat_DCTest.php
  *
- * Copyright (c) 2014-2024 Simon Fraser University
- * Copyright (c) 2000-2024 John Willinsky
+ * Copyright (c) 2014-2025 Simon Fraser University
+ * Copyright (c) 2000-2025 John Willinsky
  * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING.
  *
  * @class OAIMetadataFormat_DCTest
@@ -104,10 +104,10 @@ public function testToXml()
         $author->setFamilyName('author-lastname', 'en');
         $author->setAffiliations([
             Repo::affiliation()->newDataObject([
-                "id" => 1,
-                "authorId" => 1,
-                "ror" => 'https://ror.org/05ek4tb53',
-                "name" => ['en' => 'author-affiliation']
+                'id' => 1,
+                'authorId' => 1,
+                'ror' => 'https://ror.org/05ek4tb53',
+                'name' => ['en' => 'author-affiliation']
             ])
         ]);
         $author->setEmail('someone@example.com');
diff --git a/plugins/oaiMetadataFormats/marc/templates/record.tpl b/plugins/oaiMetadataFormats/marc/templates/record.tpl
index 3c254b7e3ef..50cd9aa252c 100644
--- a/plugins/oaiMetadataFormats/marc/templates/record.tpl
+++ b/plugins/oaiMetadataFormats/marc/templates/record.tpl
@@ -1,8 +1,8 @@
 {**
  * plugins/oaiMetadataFormats/marc/record.tpl
  *
- * Copyright (c) 2013-2024 Simon Fraser University
- * Copyright (c) 2003-2024 John Willinsky
+ * Copyright (c) 2013-2025 Simon Fraser University
+ * Copyright (c) 2003-2025 John Willinsky
  * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING.
  *
  * MARC-formatted metadata record for an article
@@ -34,9 +34,9 @@
 	{foreach from=$authors item=author}
 		<varfield id="{if $authors|@count==1}100{else}720{/if}" i1="1" i2=" ">
 			<subfield label="a">{$author->getFullName(false, true, $journal->getPrimaryLocale())|escape}</subfield>
-			{foreach from=$author->getLocalizedAffiliations() item=$affiliation}
-			{if $affiliation['ror']}<subfield code="u">{$affiliation['ror']|escape}</subfield>
-			{elseif $affiliation['name']}<subfield code="u">{$affiliation['name']|escape}</subfield>{/if}
+			{foreach from=$author->getAffiliations() item=$affiliation}
+				{if $affiliation->getRor()}<subfield code="u">{$affiliation->getRor()|escape}</subfield>
+				{else}<subfield code="u">{$affiliation->getLocalizedName($publication->getData('locale'))|escape}</subfield>{/if}
 			{/foreach}
 			{if $author->getUrl()}<subfield label="0">{$author->getUrl()|escape}</subfield>{/if}
 			{if $author->getData('orcid') && $author->getData('orcidIsVerified')}<subfield label="0">{$author->getData('orcid')|escape}</subfield>{/if}
diff --git a/plugins/oaiMetadataFormats/marcxml/templates/record.tpl b/plugins/oaiMetadataFormats/marcxml/templates/record.tpl
index bee5b42358d..077aef45999 100644
--- a/plugins/oaiMetadataFormats/marcxml/templates/record.tpl
+++ b/plugins/oaiMetadataFormats/marcxml/templates/record.tpl
@@ -1,8 +1,8 @@
 {**
  * plugins/oaiMetadataFormats/marcxml/record.tpl
  *
- * Copyright (c) 2013-2024 Simon Fraser University
- * Copyright (c) 2003-2024 John Willinsky
+ * Copyright (c) 2013-2025 Simon Fraser University
+ * Copyright (c) 2003-2025 John Willinsky
  * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING.
  *
  * MARCXML-formatted metadata record for an article
@@ -43,9 +43,9 @@
 	{foreach from=$authors item=author}
 		<datafield tag="{if $authors|@count==1}100{else}720{/if}" ind1="1" ind2=" ">
 			<subfield code="a">{$author->getFullName(false, true, $journal->getPrimaryLocale())|escape}</subfield>
-			{foreach from=$author->getLocalizedAffiliations() item=$affiliation}
-			{if $affiliation['ror']}<subfield code="u">{$affiliation['ror']|escape}</subfield>
-			{elseif $affiliation['name']}<subfield code="u">{$affiliation['name']|escape}</subfield>{/if}
+			{foreach from=$author->getAffiliations() item=$affiliation}
+				{if $affiliation->getRor()}<subfield code="u">{$affiliation->getRor()|escape}</subfield>
+				{else}<subfield code="u">{$affiliation->getLocalizedName($publication->getData('locale'))|escape}</subfield>{/if}
 			{/foreach}
 			{if $author->getUrl()}<subfield code="0">{$author->getUrl()|escape}</subfield>{/if}
 			{if $author->getData('orcid') && $author->getData('orcidIsVerified')}<subfield code="0">{$author->getData('orcid')|escape}</subfield>{/if}
diff --git a/plugins/oaiMetadataFormats/rfc1807/OAIMetadataFormat_RFC1807.php b/plugins/oaiMetadataFormats/rfc1807/OAIMetadataFormat_RFC1807.php
index b391e8e39b7..2b805debd41 100644
--- a/plugins/oaiMetadataFormats/rfc1807/OAIMetadataFormat_RFC1807.php
+++ b/plugins/oaiMetadataFormats/rfc1807/OAIMetadataFormat_RFC1807.php
@@ -3,8 +3,8 @@
 /**
  * @file plugins/oaiMetadataFormats/rfc1807/OAIMetadataFormat_RFC1807.php
  *
- * Copyright (c) 2014-2024 Simon Fraser University
- * Copyright (c) 2003-2024 John Willinsky
+ * Copyright (c) 2014-2025 Simon Fraser University
+ * Copyright (c) 2003-2025 John Willinsky
  * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING.
  *
  * @class OAIMetadataFormat_RFC1807
@@ -66,7 +66,7 @@ public function toXml($record, $format = null)
 
         // Format creators
         $creators = [];
-        foreach ($publication->getAuthors() as $author) {
+        foreach ($publication->getData('authors') as $author) {
             $creators[] = $author->getFullName(false, true);
         }
 
diff --git a/plugins/reports/articles/ArticleReportPlugin.php b/plugins/reports/articles/ArticleReportPlugin.php
index 8321ea0f216..2cd7741d73a 100644
--- a/plugins/reports/articles/ArticleReportPlugin.php
+++ b/plugins/reports/articles/ArticleReportPlugin.php
@@ -3,8 +3,8 @@
 /**
  * @file plugins/reports/articles/ArticleReportPlugin.php
  *
- * Copyright (c) 2014-2024 Simon Fraser University
- * Copyright (c) 2003-2024 John Willinsky
+ * Copyright (c) 2014-2025 Simon Fraser University
+ * Copyright (c) 2003-2025 John Willinsky
  * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING.
  *
  * @class ArticleReportPlugin
diff --git a/plugins/themes/default/styles/objects/article_details.less b/plugins/themes/default/styles/objects/article_details.less
index d8c032b0a0d..3a71d45baff 100644
--- a/plugins/themes/default/styles/objects/article_details.less
+++ b/plugins/themes/default/styles/objects/article_details.less
@@ -111,6 +111,10 @@
 			font-size: @font-sml;
 			color: @text-light;
 		}
+
+		.affiliation a {
+			display: inline-block;
+		}
 	}
 
 	.author_bios {
diff --git a/templates/frontend/objects/article_details.tpl b/templates/frontend/objects/article_details.tpl
index 58ce8901382..6e5a2934f5b 100755
--- a/templates/frontend/objects/article_details.tpl
+++ b/templates/frontend/objects/article_details.tpl
@@ -1,8 +1,8 @@
 {**
  * templates/frontend/objects/article_details.tpl
  *
- * Copyright (c) 2014-2024 Simon Fraser University
- * Copyright (c) 2003-2024 John Willinsky
+ * Copyright (c) 2014-2025 Simon Fraser University
+ * Copyright (c) 2003-2025 John Willinsky
  * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING.
  *
  * @brief View of an Article which displays all details about the article.
@@ -113,13 +113,14 @@
 							<span class="name">
 								{$author->getFullName()|escape}
 							</span>
-							{if $author->getLocalizedAffiliations()}
-							{foreach $author->getLocalizedAffiliations() as $affiliation}
+							{if count($author->getAffiliations()) > 0}
 								<span class="affiliation">
-								{$affiliation['name']|escape}
-								{if $affiliation['ror']}<a href="{$affiliation['ror']|escape}">{$rorIdIcon}</a>{/if}
-								</span><br/>
-							{/foreach}
+									{foreach name="affiliations" from=$author->getAffiliations() item="affiliation"}
+										{$affiliation->getLocalizedName()|escape}
+										{if $affiliation->getRor()}<a href="{$affiliation->getRor()|escape}">{$rorIdIcon}</a>{/if}
+										{if !$smarty.foreach.affiliations.last}{translate key="common.commaListSeparator"}{/if}
+									{/foreach}
+								</span>
 							{/if}
 							{assign var=authorUserGroup value=$userGroupsById[$author->getData('userGroupId')]}
 							{if $authorUserGroup->showTitle}
@@ -225,13 +226,13 @@
 						{if $author->getLocalizedData('biography')}
 							<li class="sub_item">
 								<div class="label">
-								{if $author->getLocalizedAffiliationNamesAsString()}
-									{capture assign="authorName"}{$author->getFullName()|escape}{/capture}
-									{capture assign="authorAffiliations"} {$author->getLocalizedAffiliationNamesAsString()|escape} {/capture}
-									{translate key="submission.authorWithAffiliation" name=$authorName affiliation=$authorAffiliations}
-								{else}
-									{$author->getFullName()|escape}
-								{/if}
+									{if $author->getLocalizedAffiliationNamesAsString()}
+										{capture assign="authorName"}{$author->getFullName()|escape}{/capture}
+										{capture assign="authorAffiliations"} {$author->getLocalizedAffiliationNamesAsString(null, ', ')|escape} {/capture}
+										{translate key="submission.authorWithAffiliation" name=$authorName affiliation=$authorAffiliations}
+									{else}
+										{$author->getFullName()|escape}
+									{/if}
 								</div>
 								<div class="value">
 									{$author->getLocalizedData('biography')|strip_unsafe_html}

From 1b02befdd6fe24a6622528f3ec2b09d08f9455d7 Mon Sep 17 00:00:00 2001
From: Bozana Bokan <bozana.bokan@posteo.net>
Date: Thu, 6 Feb 2025 11:11:46 +0100
Subject: [PATCH 3/3] pkp/pkp-lib#7135 submodules updates ##bozana/7135##

---
 lib/pkp                       | 2 +-
 lib/ui-library                | 2 +-
 plugins/generic/crossref      | 2 +-
 plugins/generic/googleScholar | 2 +-
 plugins/generic/jatsTemplate  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/pkp b/lib/pkp
index 1416c01c3e7..c680b5a27d8 160000
--- a/lib/pkp
+++ b/lib/pkp
@@ -1 +1 @@
-Subproject commit 1416c01c3e7d4bfa5f1e209337b9d573edd99100
+Subproject commit c680b5a27d86fd9e9f7d6a9603d1ae6a52eb088e
diff --git a/lib/ui-library b/lib/ui-library
index 5ef5ae492ac..34e219cc3c7 160000
--- a/lib/ui-library
+++ b/lib/ui-library
@@ -1 +1 @@
-Subproject commit 5ef5ae492ac4db387084c7724bbb58f58daa43f3
+Subproject commit 34e219cc3c7ceba322a83bb5f1925b01687553cb
diff --git a/plugins/generic/crossref b/plugins/generic/crossref
index 58ff1647dbc..eb96c7cc667 160000
--- a/plugins/generic/crossref
+++ b/plugins/generic/crossref
@@ -1 +1 @@
-Subproject commit 58ff1647dbcc30124dbd726d407653198c60af4a
+Subproject commit eb96c7cc667f8eac7f6870c4d4d5eabc0d32b9ff
diff --git a/plugins/generic/googleScholar b/plugins/generic/googleScholar
index 1189965ef12..6b0f9d32353 160000
--- a/plugins/generic/googleScholar
+++ b/plugins/generic/googleScholar
@@ -1 +1 @@
-Subproject commit 1189965ef12e515294bf311befdded09c621307b
+Subproject commit 6b0f9d32353f0b23cde634c73322eab0518b58c1
diff --git a/plugins/generic/jatsTemplate b/plugins/generic/jatsTemplate
index f45599f0601..60ccb2e324c 160000
--- a/plugins/generic/jatsTemplate
+++ b/plugins/generic/jatsTemplate
@@ -1 +1 @@
-Subproject commit f45599f0601b7eb3d2c95d1c1b989699040ee040
+Subproject commit 60ccb2e324c9f6eb22a810b3eec18d4571d37c47