diff options
| author | Brion Vibber <brion@pobox.com> | 2010-03-02 15:16:48 -0800 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-03-02 15:16:48 -0800 |
| commit | 8e06b932af93b8fbd66610c948bdde4fafd4f300 (patch) | |
| tree | 07b772b280e6f23761c0111d953b3c2f5b8d2120 /lib/mediafile.php | |
| parent | 453ad6a9964fe572f0f35821e3f78c6a77c57c49 (diff) | |
| parent | ddf3614c843bcd8d9ecfd0850ac9a8cefae6dbba (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); |