diff --git a/controllers/grid/submissions/ExportPublishedSubmissionsListGridCellProvider.php b/controllers/grid/submissions/ExportPublishedSubmissionsListGridCellProvider.php index 0f2c66b4906..027dc8020a1 100644 --- a/controllers/grid/submissions/ExportPublishedSubmissionsListGridCellProvider.php +++ b/controllers/grid/submissions/ExportPublishedSubmissionsListGridCellProvider.php @@ -80,7 +80,7 @@ public function getCellActions($request, $row, $column, $position = GridHandler: new RedirectAction( Repo::submission()->getWorkflowUrlByUserRoles($submission) ), - htmlspecialchars($title) + $title ) ]; case 'issue': diff --git a/lib/pkp b/lib/pkp index d86c2396e89..d11f57421d2 160000 --- a/lib/pkp +++ b/lib/pkp @@ -1 +1 @@ -Subproject commit d86c2396e893e53aae027ffaa7969ceaf1ff37d5 +Subproject commit d11f57421d2cefb9ce46c74ca5676671fa3dc1e8 diff --git a/plugins/generic/datacite/filter/DataciteXmlFilter.php b/plugins/generic/datacite/filter/DataciteXmlFilter.php index 7abbe2047f7..8e2e0854ad3 100644 --- a/plugins/generic/datacite/filter/DataciteXmlFilter.php +++ b/plugins/generic/datacite/filter/DataciteXmlFilter.php @@ -404,15 +404,15 @@ public function createTitlesNode($doc, $issue, $publication, $galley, $galleyFil $titlesNode = $doc->createElementNS($deployment->getNamespace(), 'titles'); // Start with the primary object locale. $primaryTitle = array_shift($titles); - $titlesNode->appendChild($node = $doc->createElementNS($deployment->getNamespace(), 'title', htmlspecialchars(PKPString::html2text($primaryTitle), ENT_COMPAT, 'UTF-8'))); + $titlesNode->appendChild($node = $doc->createElementNS($deployment->getNamespace(), 'title', htmlspecialchars($primaryTitle, ENT_COMPAT, 'UTF-8'))); // Then let the translated titles follow. foreach ($titles as $locale => $title) { - $titlesNode->appendChild($node = $doc->createElementNS($deployment->getNamespace(), 'title', htmlspecialchars(PKPString::html2text($title), ENT_COMPAT, 'UTF-8'))); + $titlesNode->appendChild($node = $doc->createElementNS($deployment->getNamespace(), 'title', htmlspecialchars($title, ENT_COMPAT, 'UTF-8'))); $node->setAttribute('titleType', DATACITE_TITLETYPE_TRANSLATED); } // And finally the alternative title. if (!empty($alternativeTitle)) { - $titlesNode->appendChild($node = $doc->createElementNS($deployment->getNamespace(), 'title', htmlspecialchars(PKPString::html2text($alternativeTitle), ENT_COMPAT, 'UTF-8'))); + $titlesNode->appendChild($node = $doc->createElementNS($deployment->getNamespace(), 'title', htmlspecialchars($alternativeTitle, ENT_COMPAT, 'UTF-8'))); $node->setAttribute('titleType', DATACITE_TITLETYPE_ALTERNATIVE); } return $titlesNode; @@ -1058,7 +1058,8 @@ public function getIssueToc($issue, $objectLocalePrecedence) $toc = ''; foreach ($submissions as $submissionInIssue) { /** @var Submission $submissionInIssue */ $currentEntry = $this->getPrimaryTranslation( - $submissionInIssue->getCurrentPublication()?->getTitles() ?? [], + // get html format because later PKPString::html2text will be applied + $submissionInIssue->getCurrentPublication()?->getTitles('html') ?? [], $objectLocalePrecedence ); assert(!empty($currentEntry));