Fixed hidden fields output (backported; fixes problem with security role editiom).

[fa-stable.git] / reporting / includes / pdf_report.inc

diff --git a/reporting/includes/pdf_report.inc b/reporting/includes/pdf_report.inc
index 40e750080657fcee2a3ad671f3457669ce381410..55c9f9634e377c371a8934133698bf6566be5557 100644 (file)
--- a/reporting/includes/pdf_report.inc
+++ b/reporting/includes/pdf_report.inc
@@ -520,11 +520,10 @@ class FrontReport extends Cpdf
                $this->fontSize = HEADER1_FONT_SIZE;
 
                // Print company logo if present and requested, or else just print company name
-               if ($this->companyLogoEnable && ($this->company['coy_logo'] != ''))
+               // Build a string specifying the location of the company logo file
+               $logo = company_path() . "/images/" . $this->company['coy_logo'];
+               if ($this->companyLogoEnable && ($this->company['coy_logo'] != '') && file_exists($logo))
                {
-                       // Build a string specifying the location of the company logo file
-                       $logo = company_path() . "/images/" . $this->company['coy_logo'];
-
                        // Width being zero means that the image will be scaled to the specified height
                        // keeping its aspect ratio intact.
                        if ($this->scaleLogoWidth)
@@ -980,7 +979,7 @@ class FrontReport extends Cpdf
                                if ($this->contactData)
                                        foreach($this->contactData as $contact)
                                                if (!empty($contact['email']))
-                                                       $contactData[] = $contact['email'];
+                                                       $contactData[] = $contact;
 
                                if(!count($contactData)) {
                                        $this->SetLang(user_language());