From d9c7dc86973c20c60cbf0c7c1149e1478488af68 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 21 Dec 2013 12:04:39 +0100 Subject: [PATCH] Fix: Add protection to not delete a root directory when deleting a company. --- htdocs/societe/class/societe.class.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index d0d28bf2cee..89a9be049ed 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -994,6 +994,8 @@ class Societe extends CommonObject require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; + $entity=isset($this->entity)?$this->entity:$conf->entity; + dol_syslog(get_class($this)."::delete", LOG_DEBUG); $error = 0; @@ -1122,12 +1124,15 @@ class Societe extends CommonObject $this->db->commit(); // Delete directory - $docdir = $conf->societe->multidir_output[$this->entity] . "/" . $id; - if (file_exists($docdir)) + if (! empty($conf->societe->multidir_output[$entity])) { - dol_delete_dir_recursive($docdir); + $docdir = $conf->societe->multidir_output[$entity] . "/" . $id; + if (dol_is_dir($docdir)) + { + dol_delete_dir_recursive($docdir); + } } - + return 1; } else