blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-24 10:22:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci

Browse Source 
Conflicts:
	application/models/person/Person_model.php
	ci_hack.php
This commit is contained in:
Paminger
2016-04-10 18:20:43 +02:00
parent 0d91cdd132 1131bff3ec
commit bf0a96f21a
5 changed files with 195 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ci_hack.php
+8 -9
View File
@@ -329,23 +329,23 @@ require_once(dirname(__FILE__).'/vendor/codeigniter/framework/system/core/Contro
* depending on another class that uses it.
*
*/
$CFG =& load_class('Config', 'core');
$CFG =& load_class('Config', 'core');
// Do we have any manually set config items in the index.php file?
if (isset($assign_to_config) && is_array($assign_to_config))
// 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)
{
foreach ($assign_to_config as $key => $value)
{
$CFG->set_item($key, $value);
}
$CFG->set_item($key, $value);
}
}
/*
* ------------------------------------------------------
* Load the Language class
* ------------------------------------------------------
*/
$LANG =& load_class('Lang', 'core');
$LANG =& load_class('Lang', 'core');
function &get_instance()
{
@@ -466,4 +466,3 @@ trait db_extra
die('Invalid DB Boolean. Wrong DB-Engine?');
}
}