Merge branch 'master' into permissions

This commit is contained in:
Paolo
2018-04-18 17:35:33 +02:00
93 changed files with 6590 additions and 4328 deletions
+3 -5
View File
@@ -29,18 +29,16 @@ class DB_Model extends FHC_Model
/**
* Constructor
*/
public function __construct($dbTable = null, $pk = null, $hasSequence = true)
public function __construct($dbtype = 'default')
{
// Call parent constructor
parent::__construct();
// Set properties
$this->pk = $pk;
$this->dbTable = $dbTable;
$this->hasSequence = $hasSequence;
$this->hasSequence = true;
// Loads DB conns and confs
$this->load->database();
$this->load->database($dbtype);
// Loads the UDF library
$this->load->library('UDFLib');