Skip to content
Snippets Groups Projects

Develop to master for 2.9.5

Merged Cyril Vazquez requested to merge develop into master
12 files
+ 74
44
Compare changes
  • Side-by-side
  • Inline
Files
12
@@ -485,7 +485,7 @@ class ArchiveTransfer extends abstractMessage
$xml->load($message->path);
$messageNamespace = $xml->documentElement->namespaceURI;
foreach ($this->packageSchemas as $name => $info) {
if (isset($info->xmlNamespace) && $info->xmlNamespace == $messageNamespace) {
if (isset($info['xmlNamespace']) && $info['xmlNamespace'] == $messageNamespace) {
$schema = $name;
break;
}
@@ -600,6 +600,7 @@ class ArchiveTransfer extends abstractMessage
public function validate($messageId, $archivalAgreement = null)
{
$this->errors = array();
$this->infos = array();
$this->replyCode = null;
$message = $this->sdoFactory->read('medona/message', $messageId);
@@ -1038,9 +1039,7 @@ class ArchiveTransfer extends abstractMessage
$this->archiveController->completeRetentionRule($archive);
}
if (!empty($archive->serviceLevelReference)) {
$this->archiveController->completeServiceLevel($archive);
}
$this->archiveController->completeServiceLevel($archive);
$this->archiveController->manageFileplanPosition($archive);
Loading