diff options
| author | Andrey Andreev <narf@devilix.net> | 2016-12-14 12:05:05 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2016-12-14 12:05:05 +0100 |
| commit | 867e8b56f752116fe1feae6c6db19020100458e3 (patch) | |
| tree | 0b25fcb5cb6f2b9580db61dbe4e76e7ba6255536 /system/core | |
| parent | 56d1efc5b14d7bd5a92800ba9394bf9201d48b61 (diff) | |
| parent | 25aab832ff5b064166b5af4f5c4269407c56b338 (diff) | |
Merge branch '3.1-stable' into develop
Diffstat (limited to 'system/core')
| -rw-r--r-- | system/core/CodeIgniter.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php index 66ed9ec8f..97cac90ad 100644 --- a/system/core/CodeIgniter.php +++ b/system/core/CodeIgniter.php @@ -67,7 +67,10 @@ defined('BASEPATH') OR exit('No direct script access allowed'); require_once(APPPATH.'config/'.ENVIRONMENT.'/constants.php'); } - require_once(APPPATH.'config/constants.php'); + if (file_exists(APPPATH.'config/constants.php')) + { + require_once(APPPATH.'config/constants.php'); + } /* * ------------------------------------------------------ |