diff options
| author | Siebrand Mazeland <s.mazeland@xs4all.nl> | 2010-03-02 19:13:51 +0100 |
|---|---|---|
| committer | Siebrand Mazeland <s.mazeland@xs4all.nl> | 2010-03-02 19:13:51 +0100 |
| commit | f65478b624f485098eb1675572357af2f3ca5c40 (patch) | |
| tree | f2b49854daaa7db9ce531c012d694977ee7b4315 /lib/mediafile.php | |
| parent | 767d49495d900979b9e694eed51e0379c529181c (diff) | |
| parent | 68347691b0c7fb3f81415abd7fcdc5aec85cc554 (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); |