From 54c6da44f6da097fe647f1159817f5798d58d743 Mon Sep 17 00:00:00 2001 From: Florian Pritz Date: Thu, 23 Jun 2011 17:02:31 +0200 Subject: remove compatibility mimetype generation Signed-off-by: Florian Pritz --- application/models/file_mod.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/models/file_mod.php b/application/models/file_mod.php index f13fd40b8..fac85c43f 100644 --- a/application/models/file_mod.php +++ b/application/models/file_mod.php @@ -114,7 +114,7 @@ class File_mod extends CI_Model { $filedata = $this->get_filedata($id); $file = $this->file($filedata['hash']); - $type = $filedata['mimetype'] ? $filedata['mimetype'] : exec(FCPATH.'scripts/mimetype -b --orig-name '.escapeshellarg($filedata['filename']).' '.escapeshellarg($file)); + $type = $filedata['mimetype']; $mode = $this->mime2extension($type); $mode = $this->filename2extension($filedata['filename']) ? $this->filename2extension($filedata['filename']) : $mode; @@ -225,7 +225,7 @@ class File_mod extends CI_Model { } // MODIFIED SINCE SUPPORT -- END - $type = $filedata['mimetype'] ? $filedata['mimetype'] : exec(FCPATH.'scripts/mimetype -b --orig-name '.escapeshellarg($filedata['filename']).' '.escapeshellarg($file)); + $type = $filedata['mimetype']; // autodetect the mode for highlighting if the URL contains a / after the ID (URL: /ID/) // URL: /ID/mode disables autodetection -- cgit v1.2.3-24-g4f1b