This commit is contained in:
Paminger
2016-04-07 15:17:26 +02:00
parent c124348484
commit bcfae6b009
14 changed files with 57 additions and 39 deletions
+24 -3
View File
@@ -289,8 +289,29 @@ switch (ENVIRONMENT)
* And away we go...
*/
//require_once BASEPATH.'core/CodeIgniter.php';
//require_once(dirname(__FILE__).'/include/authentication.class.php');
require_once(dirname(__FILE__).'/vendor/codeigniter/framework/system/core/Common.php');
require_once(dirname(__FILE__).'/vendor/codeigniter/framework/system/core/Controller.php');
/*
* ------------------------------------------------------
* Instantiate the config class
* ------------------------------------------------------
*
* Note: It is important that Config is loaded first as
* most other classes depend on it either directly or by
* depending on another class that uses it.
*
*/
$CFG =& load_class('Config', 'core');
// FH-Complete Hacks for uebergangszeit
// Do we have any manually set config items in the index.php file?
if (isset($assign_to_config) && is_array($assign_to_config))
{
foreach ($assign_to_config as $key => $value)
{
$CFG->set_item($key, $value);
}
}
function &get_instance()
{
return CI_Controller::get_instance();
@@ -301,10 +322,10 @@ require_once(dirname(__FILE__).'/vendor/codeigniter/framework/system/database/DB
require_once(dirname(__FILE__).'/vendor/codeigniter/framework/system/core/Common.php');
require_once(dirname(__FILE__).'/vendor/codeigniter/framework/system/core/Loader.php');
$loader=new CI_Loader();
require_once(dirname(__FILE__).'/vendor/codeigniter/framework/system/core/Controller.php');
//require_once(dirname(__FILE__).'/application/core/FHC_Controller.php');
$controller=new CI_Controller();
require_once(dirname(__FILE__).'/vendor/codeigniter/framework/system/core/Model.php');
require_once(dirname(__FILE__).'/application/core/MY_Model.php');
require_once(dirname(__FILE__).'/application/core/FHC_Model.php');
$model=new CI_Model();
// Traits