Merge with 3.7

This commit is contained in:
Romain Neutron
2012-11-07 16:16:13 +01:00
28 changed files with 540 additions and 576 deletions

View File

@@ -349,8 +349,9 @@ class PDF
$collection = \collection::get_from_base_id($this->app, $rec->get_base_id());
$vn = "";
if ($str = simplexml_load_string($collection->get_prefs()))
if (false !== $str = simplexml_load_string($collection->get_prefs())) {
$vn = (string) ($str->pdfPrintappear);
}
if ($vn == "" || $vn == "1") {
$RIGHT_TEXT = \phrasea::bas_names($rec->get_base_id(), $this->app);