diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2013-02-12 09:23:27 -0800 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2013-02-12 09:23:27 -0800 |
| commit | c02152c77c7c16c29b9bb9468d9e566e2521a1a2 (patch) | |
| tree | c492837b999d8f5208fc1c08f862f23453dda230 /modules/gallery/helpers/legal_file.php | |
| parent | 0302e4ec0ef04f1a11b20f3c60637246bf915b7f (diff) | |
| parent | 0a2670a19ab121fe6970f2fcdf1864cb452a76c1 (diff) | |
Merge pull request #123 from shadlaws/fix_1988
#1988 - Add movie_allow_uploads option ("always", "never", or "autodetect").
Diffstat (limited to 'modules/gallery/helpers/legal_file.php')
| -rw-r--r-- | modules/gallery/helpers/legal_file.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/gallery/helpers/legal_file.php b/modules/gallery/helpers/legal_file.php index ef588ceb..debd1e6d 100644 --- a/modules/gallery/helpers/legal_file.php +++ b/modules/gallery/helpers/legal_file.php @@ -98,7 +98,7 @@ class legal_file_Core { */ static function get_types_by_extension($extension=null) { $types_by_extension = legal_file::get_photo_types_by_extension(); - if (movie::find_ffmpeg()) { + if (movie::allow_uploads()) { $types_by_extension = array_merge($types_by_extension, legal_file::get_movie_types_by_extension()); } @@ -165,7 +165,7 @@ class legal_file_Core { */ static function get_extensions($extension=null) { $extensions = legal_file::get_photo_extensions(); - if (movie::find_ffmpeg()) { + if (movie::allow_uploads()) { $extensions = array_merge($extensions, legal_file::get_movie_extensions()); } if ($extension) { |