Do not calculate $isWrapped if not needed.

remotes/origin/stable6
Andreas Fischer 12 years ago
parent b0b76fe064
commit a04a01d51f
  1. 3
      lib/private/files/type/detection.php

@ -61,8 +61,6 @@ class Detection {
* @return string
*/
public function detect($path) {
$isWrapped = (strpos($path, '://') !== false) and (substr($path, 0, 7) === 'file://');
if (@is_dir($path)) {
// directories are easy
return "httpd/unix-directory";
@ -79,6 +77,7 @@ class Detection {
}
finfo_close($finfo);
}
$isWrapped = (strpos($path, '://') !== false) and (substr($path, 0, 7) === 'file://');
if (!$isWrapped and $mimeType === 'application/octet-stream' && function_exists("mime_content_type")) {
// use mime magic extension if available
$mimeType = mime_content_type($path);

Loading…
Cancel
Save