blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-25 08:34:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into permissions

Browse Source
This commit is contained in:
Paolo
2018-04-18 17:35:33 +02:00
parent 88a7228555 5b68f54328
commit 9d5c9b443e
93 changed files with 6590 additions and 4328 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/core/DB_Model.php
+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');
application/core/FHC_Controller.php
+10
View File
@@ -35,4 +35,14 @@ class FHC_Controller extends CI_Controller
exit;
}
}
/**
* Wrapper to load phrases using the PhrasesLib
* NOTE: The library is loaded with the alias 'p', so must me used with this alias in the rest of the code.
* EX: $this->p->t(<category>, <phrase name>)
*/
public function loadPhrases($categories, $language = null)
{
$this->load->library('PhrasesLib', array($categories, $language), 'p');
}
}