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:
Zach Copley 2009-11-04 22:05:33 -08:00
commit 2149168d29

View File

@ -513,7 +513,7 @@ class MIME_Type
return PEAR::raiseError("Can't find file command \"{$fileCmd}\""); return PEAR::raiseError("Can't find file command \"{$fileCmd}\"");
} }
$cmd->pushCommand($fileCmd, "-bI " . escapeshellarg($file)); $cmd->pushCommand($fileCmd, "-bi " . escapeshellarg($file));
$res = $cmd->execute(); $res = $cmd->execute();
unset($cmd); unset($cmd);