From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Wed, 19 Mar 2008 16:45:30 +0000 (+0100)
Subject: Import a safer fix from banana.
X-Git-Tag: xorg/0.9.16~98
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=19ad5b5d35367ed47cef0c0ee00d82ea1c23b913;p=platal.git

Import a safer fix from banana.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
---

diff --git a/classes/plupload.php b/classes/plupload.php
index 1911ab9..7184bbd 100644
--- a/classes/plupload.php
+++ b/classes/plupload.php
@@ -67,7 +67,7 @@ class PlUpload
         if ($this->exists()) {
             $this->type = trim(mime_content_type($this->filename));
             if ($this->type == 'text/plain') { // Workaround a bug of php 5.2.0+etch10 (mime_content_type fallback is 'text/plain')
-                $this->type = trim(exec("file -bi " . escapeshellarg($this->filename)));
+                $this->type = preg_replace('/;.*/', '', trim(shell_exec('file -bi ' . escapeshellarg($this->filename))));
             }
         }
     }