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

Fix export caption

Browse Source
This commit is contained in:
Romain Neutron
2012-01-09 18:50:26 +01:00
parent c01efe9d37
commit 0228edec5d
1 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/classes/set/export.class.php
View File

@@ -430,6 +430,7 @@ class set_export extends set_abstract
foreach ($this->elements as $download_element) foreach ($this->elements as $download_element)
{ {
echo "eleme";
$id = count($files); $id = count($files);
$files[$id] = array( $files[$id] = array(
@@ -486,10 +487,6 @@ class set_export extends set_abstract
{ {
continue; continue;
} }
if (!isset($sd[$name]))
{
continue;
}
set_time_limit(100); set_time_limit(100);
$subdef_export = $subdef_alive = false; $subdef_export = $subdef_alive = false;
@@ -685,7 +682,9 @@ class set_export extends set_abstract
system_file::mkdir($caption_dir); system_file::mkdir($caption_dir);
$desc = self::get_caption( $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"] $file = $files[$id]["export_name"]
@@ -713,7 +712,11 @@ class set_export extends set_abstract
$desc = self::get_caption( $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"] $file = $files[$id]["export_name"]
@@ -732,6 +735,7 @@ class set_export extends set_abstract
} }
} }
} }
$this->list = array( $this->list = array(
'files' => $files, 'files' => $files,
'names' => $file_names, 'names' => $file_names,
@@ -739,6 +743,7 @@ class set_export extends set_abstract
'count' => $n_files 'count' => $n_files
); );
return $this->list; return $this->list;
} }
@@ -758,7 +763,6 @@ class set_export extends set_abstract
return false; return false;
} }
if (isset($list['complete']) && $list['complete'] === true) if (isset($list['complete']) && $list['complete'] === true)
return; return;