mirror of
https://github.com/alchemy-fr/Phraseanet.git
synced 2025-10-17 23:13:15 +00:00
Fix export caption
This commit is contained in:
@@ -430,6 +430,7 @@ class set_export extends set_abstract
|
||||
|
||||
foreach ($this->elements as $download_element)
|
||||
{
|
||||
echo "eleme";
|
||||
$id = count($files);
|
||||
|
||||
$files[$id] = array(
|
||||
@@ -486,10 +487,6 @@ class set_export extends set_abstract
|
||||
{
|
||||
continue;
|
||||
}
|
||||
if (!isset($sd[$name]))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
set_time_limit(100);
|
||||
$subdef_export = $subdef_alive = false;
|
||||
@@ -685,7 +682,9 @@ class set_export extends set_abstract
|
||||
system_file::mkdir($caption_dir);
|
||||
|
||||
$desc = self::get_caption(
|
||||
$download_element->get_base_id(), $download_element->get_record_id(), $session->get_ses_id()
|
||||
$download_element->get_base_id()
|
||||
, $download_element->get_record_id()
|
||||
, $session->get_ses_id()
|
||||
);
|
||||
|
||||
$file = $files[$id]["export_name"]
|
||||
@@ -713,7 +712,11 @@ class set_export extends set_abstract
|
||||
|
||||
|
||||
$desc = self::get_caption(
|
||||
$download_element->get_base_id(), $download_element->get_record_id(), $session->get_ses_id(), true, 'yaml'
|
||||
$download_element->get_base_id()
|
||||
, $download_element->get_record_id()
|
||||
, $session->get_ses_id()
|
||||
, true
|
||||
, 'yaml'
|
||||
);
|
||||
|
||||
$file = $files[$id]["export_name"]
|
||||
@@ -732,6 +735,7 @@ class set_export extends set_abstract
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$this->list = array(
|
||||
'files' => $files,
|
||||
'names' => $file_names,
|
||||
@@ -739,6 +743,7 @@ class set_export extends set_abstract
|
||||
'count' => $n_files
|
||||
);
|
||||
|
||||
|
||||
return $this->list;
|
||||
}
|
||||
|
||||
@@ -758,7 +763,6 @@ class set_export extends set_abstract
|
||||
return false;
|
||||
}
|
||||
if (isset($list['complete']) && $list['complete'] === true)
|
||||
|
||||
return;
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user