From 6d469ba2f01dc8cd5d02163aec81f7b595e06185 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Fri, 30 Apr 2010 07:57:19 +0000 Subject: [PATCH] Fix: regression --- htdocs/admin/modules.php | 2 +- htdocs/includes/modules/modMultiCompany.class.php | 2 +- htdocs/lib/admin.lib.php | 9 ++------- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php index 5bcfa3dfa95..2933d8e3198 100644 --- a/htdocs/admin/modules.php +++ b/htdocs/admin/modules.php @@ -98,7 +98,7 @@ function Activate($value,$withdeps=1) } // Test if Dolibarr version ok - $verdol=versiondolibarrarray(1); + $verdol=versiondolibarrarray(); $vermin=$objMod->need_dolibarr_version; //print 'eee'.versioncompare($verdol,$vermin).join(',',$verdol).' - '.join(',',$vermin);exit; if (is_array($vermin) && versioncompare($verdol,$vermin) < 0) diff --git a/htdocs/includes/modules/modMultiCompany.class.php b/htdocs/includes/modules/modMultiCompany.class.php index 94225673f64..3756ba1331e 100644 --- a/htdocs/includes/modules/modMultiCompany.class.php +++ b/htdocs/includes/modules/modMultiCompany.class.php @@ -80,7 +80,7 @@ class modMultiCompany extends DolibarrModules $this->depends = array(); // List of modules id that must be enabled if this module is enabled $this->requiredby = array(); // List of modules id to disable if this one is disabled $this->phpmin = array(4,3); // Minimum version of PHP required by module - $this->need_dolibarr_version = array(2,9); // Minimum version of Dolibarr required by module + $this->need_dolibarr_version = array(2,9,'0-dev'); // Minimum version of Dolibarr required by module $this->langfiles = array("multicompany"); // Constants diff --git a/htdocs/lib/admin.lib.php b/htdocs/lib/admin.lib.php index 38f7665e927..9cf42634774 100644 --- a/htdocs/lib/admin.lib.php +++ b/htdocs/lib/admin.lib.php @@ -83,13 +83,8 @@ function versionphparray() * \return array Tableau de version (vermajeur,vermineur,autre) */ function versiondolibarrarray($fortest=0) -{ - $dol_version = DOL_VERSION; - - // Used for development version - if ($fortest) $dol_version = preg_replace('/([A-Z\-]+)$/i','',DOL_VERSION); - - return explode('.',$dol_version); +{ + return explode('.',DOL_VERSION); }