From 5fd09b68db2137db63649dc2948f148d7dc44912 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 30 May 2013 19:29:08 +0200 Subject: [PATCH] Fix: Support pages were not independants. --- htdocs/support/default.css | 1 - htdocs/support/inc.php | 13 +------------ htdocs/support/index.php | 2 +- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/htdocs/support/default.css b/htdocs/support/default.css index e63759ba19b..07ca0f8ebd0 100644 --- a/htdocs/support/default.css +++ b/htdocs/support/default.css @@ -13,7 +13,6 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * */ body { diff --git a/htdocs/support/inc.php b/htdocs/support/inc.php index 122f0626079..10edaf91f96 100644 --- a/htdocs/support/inc.php +++ b/htdocs/support/inc.php @@ -24,24 +24,13 @@ * \brief File that define environment for support pages */ -// Just to define version DOL_VERSION -if (! defined('DOL_INC_FOR_VERSION_ERROR')) define('DOL_INC_FOR_VERSION_ERROR','1'); -require_once '../filefunc.inc.php'; - -// Define DOL_DOCUMENT_ROOT and ADODB_PATH used for install/upgrade process +// Define DOL_DOCUMENT_ROOT if (! defined('DOL_DOCUMENT_ROOT')) define('DOL_DOCUMENT_ROOT', '..'); -if (! defined('ADODB_PATH')) -{ - $foundpath=DOL_DOCUMENT_ROOT .'/includes/adodbtime/'; - if (! is_dir($foundpath)) $foundpath='/usr/share/php/adodb/'; - define('ADODB_PATH', $foundpath); -} require_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; -require_once ADODB_PATH.'adodb-time.inc.php'; // Avoid warnings with strict mode E_STRICT $conf = new stdClass(); // instantiate $conf explicitely diff --git a/htdocs/support/index.php b/htdocs/support/index.php index b56393dcbac..6b555672631 100644 --- a/htdocs/support/index.php +++ b/htdocs/support/index.php @@ -41,7 +41,7 @@ $langs->load("help"); * View */ -pHeader($langs->trans("DolibarrHelpCenter").' '.DOL_VERSION, $_SERVER["PHP_SELF"]); +pHeader($langs->trans("DolibarrHelpCenter"), $_SERVER["PHP_SELF"]); print $langs->trans("HelpCenterDesc1")."
\n"; print $langs->trans("HelpCenterDesc2")."
\n";