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

Changes:

Browse Source 
application/controllers/api/v1/Person.php
	Fixed conflicts

application/models/person/Person_model.php
	Fixed conflicts

ci_hack.php
	Load the language class otherwise some VileSci functionalities would crash
	Ex: Personen -> Zusammenlegen

tests/codesniffer/FHComplete/ruleset.xml
	Turned off ParamCommentFullStop option
This commit is contained in:
paolo
2016-04-08 16:53:52 +02:00
parent 5e59fc3c17
commit 1131bff3ec
4 changed files with 215 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ci_hack.php
+16 -9
View File
@@ -302,16 +302,24 @@ 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');
function &get_instance()
{
return CI_Controller::get_instance();
@@ -430,5 +438,4 @@ trait db_extra
else
die('Invalid DB Boolean. Wrong DB-Engine?');
}
}
}