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

Merge origin/ci into ci

Browse Source 
Conflicts:
	application/config/config.php
	tests/codeception/_data/dump.sql
	tests/codeception/api/v1/PersonCept.php
This commit is contained in:
paolo
2016-04-27 11:54:20 +02:00
parent 51774021b4
commit 549b0133c2
8 changed files with 577 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/config/config.php
+4 -8
View File
@@ -509,13 +509,9 @@ $config['proxy_ips'] = '';
|--------------------------------------------------------------------------
|
| It's working, so don't delete this :D
*/
*/
spl_autoload_register(function ($class) {
if (substr($class,0,3) !== 'CI_' && substr($class,0,4) !== 'FHC_')
{
if (file_exists($file = APPPATH . 'core/' . $class . '.php'))
{
require_once $file;
}
}
});
if (file_exists($file = APPPATH . 'core/' . $class . '.php'))
require_once $file;
});