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/libraries | |
| 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/libraries')
| -rw-r--r-- | modules/gallery/libraries/Form_Uploadify.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/gallery/libraries/Form_Uploadify.php b/modules/gallery/libraries/Form_Uploadify.php index 56793c69..1e58018d 100644 --- a/modules/gallery/libraries/Form_Uploadify.php +++ b/modules/gallery/libraries/Form_Uploadify.php @@ -46,7 +46,7 @@ class Form_Uploadify_Core extends Form_Input { $v->album = $this->data["album"]; $v->script_data = $this->data["script_data"]; $v->simultaneous_upload_limit = module::get_var("gallery", "simultaneous_upload_limit"); - $v->movies_allowed = (bool) movie::find_ffmpeg(); + $v->movies_allowed = movie::allow_uploads(); $v->extensions = legal_file::get_filters(); $v->suhosin_session_encrypt = (bool) ini_get("suhosin.session.encrypt"); |
