From c9f15c4fad16e0c610b9760ecb44e4bd10655f63 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Fri, 8 May 2009 11:04:25 +0000 Subject: [PATCH] =?UTF-8?q?Fix:=20les=20r=E9pertoires=20de=20l'entity=201?= =?UTF-8?q?=20sont=20par=20d=E9faut=20=E0=20la=20racine=20du=20r=E9pertoir?= =?UTF-8?q?e=20"documents"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/includes/modules/DolibarrModules.class.php | 2 +- htdocs/install/upgrade2.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/includes/modules/DolibarrModules.class.php b/htdocs/includes/modules/DolibarrModules.class.php index a3fb2bf2c40..0ace8db325d 100644 --- a/htdocs/includes/modules/DolibarrModules.class.php +++ b/htdocs/includes/modules/DolibarrModules.class.php @@ -1066,7 +1066,7 @@ class DolibarrModules } // Define directory full path - if (empty($conf->global->MAIN_MODULE_MULTICOMPANY)) $fulldir = DOL_DATA_ROOT.$dir; + if (empty($conf->global->MAIN_MODULE_MULTICOMPANY) || $conf->entity == 1) $fulldir = DOL_DATA_ROOT.$dir; else $fulldir = DOL_DATA_ROOT."/".$conf->entity.$dir; // Create dir if it does not exists if ($fulldir && ! file_exists($fulldir)) diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php index b3a6ed08b4e..98a16d45661 100644 --- a/htdocs/install/upgrade2.php +++ b/htdocs/install/upgrade2.php @@ -1,7 +1,7 @@ * Copyright (C) 2005-2009 Laurent Destailleur - * Copyright (C) 2005-2008 Regis Houssin + * Copyright (C) 2005-2009 Regis Houssin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by