Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
* '0.9.x' of gitorious.org:statusnet/mainline: Revert a OS X-specific change to PEAR MIME_Type that I accidentally commited.
This commit is contained in:
commit
2149168d29
@ -513,7 +513,7 @@ class MIME_Type
|
||||
return PEAR::raiseError("Can't find file command \"{$fileCmd}\"");
|
||||
}
|
||||
|
||||
$cmd->pushCommand($fileCmd, "-bI " . escapeshellarg($file));
|
||||
$cmd->pushCommand($fileCmd, "-bi " . escapeshellarg($file));
|
||||
$res = $cmd->execute();
|
||||
unset($cmd);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user