diff --git a/ChangeLog b/ChangeLog index 2da9d45364d..6e81703b33a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,7 @@ Fix: Update impayees.php Fix: Link product, In list view and label product Fix: visible task into area "time" for "My task" must limit task to tasks i am assigned to. Fix: When disabled, all fields to add time into task line must be disabled. +Fix: Missing include files.lib.php in some pages ti use dol_delete_recursive ***** ChangeLog for 3.5.4 compared to 3.5.3 ***** Fix: Hide title of event when agenda module disabled. diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php index 99a89ff0d1e..e71e9c8541a 100644 --- a/htdocs/adherents/fiche.php +++ b/htdocs/adherents/fiche.php @@ -328,6 +328,7 @@ if ($action == 'update' && ! $_POST["cancel"] && $user->rights->adherent->creer) { if (GETPOST('deletephoto')) { + require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php'; $fileimg=$conf->adherent->dir_output.'/'.get_exdir($object->id,2,0,1).'/photos/'.$object->photo; $dirthumbs=$conf->adherent->dir_output.'/'.get_exdir($object->id,2,0,1).'/photos/thumbs'; dol_delete_file($fileimg); diff --git a/htdocs/admin/tools/update.php b/htdocs/admin/tools/update.php index 29e4c96b6c3..e449d265fa3 100644 --- a/htdocs/admin/tools/update.php +++ b/htdocs/admin/tools/update.php @@ -23,7 +23,7 @@ */ require '../../main.inc.php'; -include_once $dolibarr_main_document_root.'/core/lib/files.lib.php'; +include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php'; $langs->load("admin"); $langs->load("other"); diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php index 6eda2558daf..7da3e5aaf7e 100644 --- a/htdocs/contrat/class/contrat.class.php +++ b/htdocs/contrat/class/contrat.class.php @@ -811,6 +811,7 @@ class Contrat extends CommonObject function delete($user) { global $conf, $langs; + require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php'; $error=0; diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php index 40248cd6596..cc7ede21ea9 100644 --- a/htdocs/core/lib/pdf.lib.php +++ b/htdocs/core/lib/pdf.lib.php @@ -427,7 +427,7 @@ function pdf_pagehead(&$pdf,$outputlangs,$page_height) global $conf; // Add a background image on document - if (! empty($conf->global->MAIN_USE_BACKGROUND_ON_PDF)) + if (! empty($conf->global->MAIN_USE_BACKGROUND_ON_PDF)) // Warning, this option make TCPDF generation beeing crazy and some content disappeared behin the image { $pdf->SetAutoPageBreak(0,0); // Disable auto pagebreak before adding image $pdf->Image($conf->mycompany->dir_output.'/logos/'.$conf->global->MAIN_USE_BACKGROUND_ON_PDF, (isset($conf->global->MAIN_USE_BACKGROUND_ON_PDF_X)?$conf->global->MAIN_USE_BACKGROUND_ON_PDF_X:0), (isset($conf->global->MAIN_USE_BACKGROUND_ON_PDF_Y)?$conf->global->MAIN_USE_BACKGROUND_ON_PDF_Y:0), 0, $page_height); @@ -795,7 +795,7 @@ function pdf_pagefoot(&$pdf,$outputlangs,$paramfreetext,$fromcompany,$marge_bass if ($line) // Free text { $pdf->SetXY($dims['lm'],-$posy); - $pdf->MultiCell($width, 3, $line, 0, $align, 0); + $pdf->MultiCell(0, 3, $line, 0, $align, 0); $posy-=$freetextheight; } diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 59dbc487f74..52ad1a7f323 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -594,6 +594,7 @@ class Product extends CommonObject function delete($id=0) { global $conf,$user,$langs; + require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php'; $error=0; diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php index c6ad2b82604..57b1ecc695e 100644 --- a/htdocs/projet/class/task.class.php +++ b/htdocs/projet/class/task.class.php @@ -354,6 +354,7 @@ class Task extends CommonObject { global $conf, $langs; + require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php'; $error=0; diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index c4e9b87ff44..309d6f87e46 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -681,7 +681,7 @@ div.mainmenu.click2dial { } div.mainmenu.companies { - background-image: url(); + background-image: url(); } div.mainmenu.commercial {