mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-07-21 17:02:19 +00:00
- Renamed helpers to avoid conflicts with CI helpers
- Adapted helpers includes
This commit is contained in:
@@ -14,7 +14,7 @@ class Test extends REST_Controller
|
||||
parent::__construct();
|
||||
|
||||
// Loads helper message to manage returning messages
|
||||
$this->load->helper('message');
|
||||
$this->load->helper('fhc_message');
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -44,7 +44,7 @@ class AmpelMail extends FHC_Controller
|
||||
$this->load->model('person/Person_model', 'PersonModel');
|
||||
|
||||
// Load helpers
|
||||
$this->load->helper('sancho');
|
||||
$this->load->helper('fhc_sancho');
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -12,10 +12,10 @@ class APIv1_Controller extends REST_Controller
|
||||
parent::__construct();
|
||||
|
||||
// Loads helper message to manage returning messages
|
||||
$this->load->helper('message');
|
||||
$this->load->helper('fhc_message');
|
||||
|
||||
// Loads helper with generic utility function
|
||||
$this->load->helper('fhc');
|
||||
$this->load->helper('fhc_common');
|
||||
|
||||
// Loads permission lib
|
||||
$this->load->library('PermissionLib');
|
||||
|
||||
@@ -12,7 +12,7 @@ class Auth_Controller extends FHC_Controller
|
||||
parent::__construct();
|
||||
|
||||
// Loads authentication helper
|
||||
$this->load->helper('fhcauth');
|
||||
$this->load->helper('fhc_authentication');
|
||||
|
||||
// Checks if the caller is allowed to access to this content
|
||||
$this->_isAllowed($requiredPermissions);
|
||||
|
||||
@@ -21,16 +21,16 @@ class FHC_Controller extends CI_Controller
|
||||
$this->_controllerId = null; // set _controllerId as null by default
|
||||
|
||||
// Loads helper message to manage returning messages
|
||||
$this->load->helper('message');
|
||||
$this->load->helper('fhc_message');
|
||||
|
||||
// Loads helper with generic utility function
|
||||
$this->load->helper('fhc');
|
||||
$this->load->helper('fhc_common');
|
||||
|
||||
// Loads helper session to manage the php session
|
||||
$this->load->helper('session');
|
||||
$this->load->helper('fhc_session');
|
||||
|
||||
// Loads language helper
|
||||
$this->load->helper('language');
|
||||
$this->load->helper('fhc_language');
|
||||
}
|
||||
|
||||
//------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
@@ -87,7 +87,7 @@ class FiltersLib
|
||||
$this->_ci =& get_instance(); // get code igniter instance
|
||||
|
||||
// Loads authentication helper
|
||||
$this->_ci->load->helper('fhcauth'); // NOTE: needed to load custom filters do not remove!
|
||||
$this->_ci->load->helper('fhc_authentication'); // NOTE: needed to load custom filters do not remove!
|
||||
|
||||
$this->_filterUniqueId = $this->_getFilterUniqueId($params); // sets the id for the related filter widget
|
||||
}
|
||||
|
||||
@@ -18,7 +18,7 @@ class MessageToken_model extends CI_Model
|
||||
$this->config->load('message');
|
||||
|
||||
// Load return message helper
|
||||
$this->load->helper('message');
|
||||
$this->load->helper('fhc_message');
|
||||
|
||||
// Loads the database object
|
||||
$this->load->database();
|
||||
|
||||
Reference in New Issue
Block a user