projects
/
banana.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Workaround a bug of php 5.2.0+etch10 which has a fallback to text/plain
[banana.git]
/
banana
/
mimepart.inc.php
diff --git
a/banana/mimepart.inc.php
b/banana/mimepart.inc.php
index
6b0f399
..
743ced2
100644
(file)
--- a/
banana/mimepart.inc.php
+++ b/
banana/mimepart.inc.php
@@
-238,6
+238,9
@@
class BananaMimePart
{
if ($is_filename) {
$type = mime_content_type($data);
{
if ($is_filename) {
$type = mime_content_type($data);
+ if ($type == 'text/plain') { // XXX Workaround a bug of php 5.2.0+etch10 (fallback for mime_content_type is text/plain)
+ $type = preg_replace('/;.*/', '', trim(shell_exec('file -bi ' . escapeshellarg($data))));
+ }
} else {
$arg = escapeshellarg($data);
$type = preg_replace('/;.*/', '', trim(shell_exec("echo $arg | file -bi -")));
} else {
$arg = escapeshellarg($data);
$type = preg_replace('/;.*/', '', trim(shell_exec("echo $arg | file -bi -")));