diff options
| author | Zach Copley <zach@status.net> | 2010-03-05 03:56:04 +0000 |
|---|---|---|
| committer | Zach Copley <zach@status.net> | 2010-03-05 03:56:04 +0000 |
| commit | b8001ea1079c4c8895fd2323e1e4a47c0d71fde3 (patch) | |
| tree | b732b239bf790c78c90f4c7d3be7044ce9f7da45 /lib/mediafile.php | |
| parent | e3c4b0c85d3fbae9604b22d3666fe36a3c1c7551 (diff) | |
| parent | 064c45890f896f2af8a0231449fa5337bb79c509 (diff) | |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'lib/mediafile.php')
| -rw-r--r-- | lib/mediafile.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/mediafile.php b/lib/mediafile.php index e3d5b1dbc..10d90d008 100644 --- a/lib/mediafile.php +++ b/lib/mediafile.php @@ -262,7 +262,7 @@ class MediaFile $filetype = MIME_Type::autoDetect($stream['uri']); } - if (in_array($filetype, common_config('attachments', 'supported'))) { + if (common_config('attachments', 'supported') === true || in_array($filetype, common_config('attachments', 'supported'))) { return $filetype; } $media = MIME_Type::getMedia($filetype); |