summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2017-02-06 09:34:33 +0100
committerAndrey Andreev <narf@devilix.net>2017-02-06 09:34:33 +0100
commit8057d79e54e9f7f577089eecdc2c33be801d3e3f (patch)
treeb0acea577c1a77cec8713fab2a5055c2ce0f1606
parentd60e51ba3bc542ead57d9d7b3b5f11e5c26a72e4 (diff)
[ci skip] Eliminate a needless array_merge() call from PR #5006 patch
-rw-r--r--system/core/Common.php9
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'))
{