diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 1c5332ac746..614fdfa366a 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -10784,7 +10784,7 @@ function getDictionaryValue($tablename, $field, $id, $checkentity = false, $rowi $resql = $db->query($sql); if ($resql) { while ($obj = $db->fetch_object($resql)) { - $dictvalues[$obj->{$rowidfield}] = $obj; // $obj is stdClass + $dictvalues[$obj->$rowidfield] = $obj; // $obj is stdClass } } else { dol_print_error($db); diff --git a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php index 6454c9b1da2..57a9e81ddef 100644 --- a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php +++ b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php @@ -1523,12 +1523,12 @@ class pdf_cyan extends ModelePDFPropales // Output Rect $this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect takes a length in 3rd parameter and 4th parameter - + if (!empty($conf->global->MAIN_PDF_TITLE_TEXT_COLOR)) { $arrayColorTextTitle = explode(',', $conf->global->MAIN_PDF_TITLE_TEXT_COLOR); $pdf->SetTextColor($arrayColorTextTitle[0], $arrayColorTextTitle[1], $arrayColorTextTitle[2]); } - + $this->pdfTabTitles($pdf, $tab_top, $tab_height, $outputlangs, $hidetop); if (!empty($conf->global->MAIN_PDF_TITLE_TEXT_COLOR)) { diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php index 02f30356cf8..0f6d52638cb 100644 --- a/htdocs/emailcollector/class/emailcollector.class.php +++ b/htdocs/emailcollector/class/emailcollector.class.php @@ -3390,7 +3390,7 @@ class EmailCollector extends CommonObject $attachments[$filename] = $data; // this is a problem if two files have same name if (strlen($destdir)) { - if (substr($destdir,-1) != '/') $destdir .= '/'; + if (substr($destdir, -1) != '/') $destdir .= '/'; // Get file name (with extension) $file_name_complete = $params['filename'];