diff --git a/lib/helper.php b/lib/helper.php index 0e549d006a..a0fbdd1039 100644 --- a/lib/helper.php +++ b/lib/helper.php @@ -394,13 +394,12 @@ class OC_Helper { // it looks like we have a 'file' command, // lets see if it does have mime support $path=escapeshellarg($path); - $fp = popen("file -i -b $path 2>/dev/null", "r"); + $fp = popen("file -b --mime-type $path 2>/dev/null", "r"); $reply = fgets($fp); pclose($fp); - // we have smth like 'text/x-c++; charset=us-ascii\n' - // and need to eliminate everything starting with semicolon including trailing LF - $mimeType = preg_replace('/;.*/ms', '', trim($reply)); + //trim the newline + $mimeType = trim($reply); } return $mimeType;