Skip to content

Commit 928e011

Browse files
authored
Merge pull request pkp#11064 from kaitlinnewson/11063-3_5_0
pkp#11063 handle missing affiliation in user export
2 parents 35916d0 + 99f60ab commit 928e011

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

plugins/importexport/users/filter/PKPUserUserXmlFilter.php

+5-3
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,11 @@ public function createPKPUserNode($doc, $user)
9292
$this->createLocalizedNodes($doc, $userNode, 'givenname', $user->getGivenName(null));
9393
$this->createLocalizedNodes($doc, $userNode, 'familyname', $user->getFamilyName(null));
9494

95-
$affiliationNode = $doc->createElementNS($deployment->getNamespace(), 'affiliation');
96-
$this->createLocalizedNodes($doc, $affiliationNode, 'name', $user->getAffiliation(null));
97-
$userNode->appendChild($affiliationNode);
95+
if ($user->getAffiliation(null)) {
96+
$affiliationNode = $doc->createElementNS($deployment->getNamespace(), 'affiliation');
97+
$this->createLocalizedNodes($doc, $affiliationNode, 'name', $user->getAffiliation(null));
98+
$userNode->appendChild($affiliationNode);
99+
}
98100

99101
$this->createOptionalNode($doc, $userNode, 'country', $user->getCountry());
100102
$userNode->appendChild($doc->createElementNS($deployment->getNamespace(), 'email', htmlspecialchars($user->getEmail(), ENT_COMPAT, 'UTF-8')));

0 commit comments

Comments
 (0)