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

Merge branch 'clean-boxes' into merge-clean-boxes

Browse Source
This commit is contained in:
Thibaud Fabre
2016-01-06 19:53:43 +01:00
parent e3f49db7b6 232b72269a
commit c92d5da9fe
56 changed files with 2546 additions and 902 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Alchemy/Phrasea/Out/Module/PDF.php
View File

@@ -350,7 +350,7 @@ class PDF
}
}
$collection = \collection::get_from_base_id($this->app, $rec->get_base_id());
$collection = \collection::getByBaseId($this->app, $rec->get_base_id());
$vn = "";
if (false !== $str = simplexml_load_string($collection->get_prefs())) {