diff options
author | Bharat Mediratta <bharat@menalto.com> | 2010-08-21 15:11:06 -0700 |
---|---|---|
committer | Bharat Mediratta <bharat@menalto.com> | 2010-08-21 15:11:06 -0700 |
commit | c6a28a93ddfcf692e67342707d2b4a41dcf19fe5 (patch) | |
tree | 99571ed2272d82b6be963f6effc5817b1fd036bd /modules/gallery/libraries/Form_Uploadify.php | |
parent | 4a01aaddc9fa443ca9e022666078d8a2d0578d8a (diff) |
Put up a warning and don't accept movie files if we don't have ffmpeg.
This fixes ticket #973.
Diffstat (limited to 'modules/gallery/libraries/Form_Uploadify.php')
-rw-r--r-- | modules/gallery/libraries/Form_Uploadify.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/modules/gallery/libraries/Form_Uploadify.php b/modules/gallery/libraries/Form_Uploadify.php index e5b6d819..79477763 100644 --- a/modules/gallery/libraries/Form_Uploadify.php +++ b/modules/gallery/libraries/Form_Uploadify.php @@ -46,6 +46,8 @@ 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->suhosin_session_encrypt = (bool) ini_get("suhosin.session.encrypt"); return $v; } |