Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-14 13:31:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix class cant be abstract

Browse Source
This commit is contained in:
Laurent Destailleur
2015-11-04 16:43:24 +01:00
parent 497bc91493
commit 09f3cd6f1d
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/core/lib/admin.lib.php
View File

@@ -838,13 +838,14 @@ function unActivateModule($value, $requiredby=1)
} }
else else
{ {
// TODO Replace this afte DolibarrModules is moved as abstract class with a try catch to show module is bugged //print $dir.$modFile;
// TODO Replace this after DolibarrModules is moved as abstract class with a try catch to show module we try to disable has not been found or could not be loaded
$genericMod = new DolibarrModules($db); $genericMod = new DolibarrModules($db);
$genericMod->name=preg_replace('/^mod/i','',$modName); $genericMod->name=preg_replace('/^mod/i','',$modName);
$genericMod->rights_class=strtolower(preg_replace('/^mod/i','',$modName)); $genericMod->rights_class=strtolower(preg_replace('/^mod/i','',$modName));
$genericMod->const_name='MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i','',$modName)); $genericMod->const_name='MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i','',$modName));
dol_syslog("modules::unActivateModule Failed to find module file, we use generic function with name " . $modName); dol_syslog("modules::unActivateModule Failed to find module file, we use generic function with name " . $modName);
$genericMod->_remove(); $genericMod->_remove(array());
} }
// Desactivation des modules qui dependent de lui // Desactivation des modules qui dependent de lui

8
htdocs/core/modules/DolibarrModules.class.php
View File

@@ -32,7 +32,7 @@
* *
* Parent class for module descriptor class files * Parent class for module descriptor class files
*/ */
abstract class DolibarrModules class DolibarrModules
{ {
/** /**
* @var DoliDb Database handler * @var DoliDb Database handler
@@ -199,10 +199,14 @@ abstract class DolibarrModules
* *
* @param DoliDB $db Database handler * @param DoliDB $db Database handler
*/ */
//public function __construct($db); public function __construct($db)
{
$this->db = $db;
}
// We should but can't set this as abstract because this will make dolibarr hang // We should but can't set this as abstract because this will make dolibarr hang
// after migration due to old module not implementing. We must wait PHP is able to make // after migration due to old module not implementing. We must wait PHP is able to make
// a try catch on Fatal error to manage this correctly. // a try catch on Fatal error to manage this correctly.
// We need constructor into function unActivateModule into admin.lib.php
/** /**
* Enables a module. * Enables a module.