diff options
| -rw-r--r-- | system/core/Common.php | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/system/core/Common.php b/system/core/Common.php index 8b74db0a3..f7bd42600 100644 --- a/system/core/Common.php +++ b/system/core/Common.php @@ -319,12 +319,9 @@ if ( ! function_exists('get_mimes')) if (empty($_mimes)) { - $_mimes = array(); - - if (file_exists(APPPATH.'config/mimes.php')) - { - $_mimes = array_merge($_mimes, include(APPPATH.'config/mimes.php')); - } + $_mimes = file_exists(APPPATH.'config/mimes.php') + ? include(APPPATH.'config/mimes.php') + : array(); if (file_exists(APPPATH.'config/'.ENVIRONMENT.'/mimes.php')) { |