hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 23:13:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix #1095 : task archive crashed

Browse Source
This commit is contained in:
jygaulier
2013-02-12 16:23:28 +01:00
committed by Romain Neutron
parent 4c4ebb6a8a
commit a29a1e5055
2 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/classes/task/period/archive.php
View File

@@ -1611,6 +1611,7 @@ class task_period_archive extends task_abstract
$metadatasStructure = $databox->get_meta_structure();
$metadatas = $this->getIndexByFieldName($metadatasStructure, $media->getMetadatas());
$metaFields = null;
if ($captionFile !== null && true === $this->dependencyContainer['filesystem']->exists($captionFile)) {
$metaFields = $this->readXMLForDatabox($metadatasStructure, $captionFile);
@@ -1625,7 +1626,10 @@ class task_period_archive extends task_abstract
$story->substitute_subdef('document', $media, $this->dependencyContainer);
$story->set_metadatas($metadatas->toMetadataArray($metadatasStructure), true);
$story->set_metadatas($metaFields->toMetadataArray($metadatasStructure), true);
if ($metaFields) {
$story->set_metadatas($metaFields->toMetadataArray($metadatasStructure), true);
}
$story->set_binary_status(databox_status::operation_or($this->dependencyContainer, $stat0, $stat1));
$story->rebuild_subdefs();
@@ -1676,6 +1680,7 @@ class task_period_archive extends task_abstract
$metadatas = $this->getIndexByFieldName($metadatasStructure, $media->getMetadatas());
$metaFields = array();
if ($captionFile !== null && true === $this->dependencyContainer['filesystem']->exists($captionFile)) {
$metaFields = $this->readXMLForDatabox($metadatasStructure, $captionFile);
$captionStatus = $this->parseStatusBit(@simplexml_load_file($captionFile));