OSB enhancements to date

2010-11-30 09:41:08 +11:00
parent 8715a2059b
commit ec6a542bc3
478 changed files with 23423 additions and 9309 deletions
--- a/modules/module/module.inc.php
+++ b/modules/module/module.inc.php
@@ -32,8 +32,8 @@ class module extends OSB_module {
 	/**
 	 * Initialise the module
 	 */
-	public function __construct() {
-		parent::__construct();
+	public function __construct($id=null) {
+		parent::__construct($id);

 		$this->dev_inst_excl = array(
 			'staff','staff_department',
@@ -239,6 +239,7 @@ class module extends OSB_module {
 			$dependancy = sprintf('%s,%s',$parent,$install['install']['module_properties']['dependancy']);
 		else
 			$dependancy = $parent;
+		$dependancy = preg_replace('/,$/','',$dependancy);

 		if ($dependancy) {
 			if (preg_match('/,/', $dependancy))