summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2016-12-01 13:27:32 +0100
committerAndrey Andreev <narf@devilix.net>2016-12-01 13:27:32 +0100
commitefaf5aa28ddded9f9e43cfd0afa91fda09c4ff2f (patch)
tree1817513fa299fdea51a5c784157de0e24d58cb44
parentd76431db46e04d650c1c538493021cdf336d1301 (diff)
Remove a function_exists('escapeshellarg') check from CI_Upload
This didn't originally exist, but was changed due to #1494. We no longer tolerate such broken environments
-rw-r--r--system/libraries/Upload.php4
1 files changed, 1 insertions, 3 deletions
diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php
index 778ed6892..490421af9 100644
--- a/system/libraries/Upload.php
+++ b/system/libraries/Upload.php
@@ -1259,9 +1259,7 @@ class CI_Upload {
*/
if (DIRECTORY_SEPARATOR !== '\\')
{
- $cmd = function_exists('escapeshellarg')
- ? 'file --brief --mime '.escapeshellarg($file['tmp_name']).' 2>&1'
- : 'file --brief --mime '.$file['tmp_name'].' 2>&1';
+ $cmd = 'file --brief --mime '.escapeshellarg($file['tmp_name']).' 2>&1';
if (function_usable('exec'))
{