diff options
| author | Andrey Andreev <narf@devilix.net> | 2015-10-12 16:16:35 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2015-10-12 16:16:35 +0200 |
| commit | 3013f53c59a5d2550a126b1493cf8262bd62dd53 (patch) | |
| tree | 772e9b569a65e8567c366671373a2700c2028445 /system/helpers | |
| parent | 30f593bbb3408d0c076f2453818c68a7c5c59248 (diff) | |
| parent | 36a055e49b040e6f18be7bce5e010c2a90d2f44f (diff) | |
Merge branch '3.0-stable' into develop
Diffstat (limited to 'system/helpers')
| -rw-r--r-- | system/helpers/file_helper.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/helpers/file_helper.php b/system/helpers/file_helper.php index cd1c641ec..f6cb1629a 100644 --- a/system/helpers/file_helper.php +++ b/system/helpers/file_helper.php @@ -343,7 +343,7 @@ if ( ! function_exists('get_mime_by_extension')) if ( ! is_array($mimes)) { - $mimes =& get_mimes(); + $mimes = get_mimes(); if (empty($mimes)) { |