From c6a28a93ddfcf692e67342707d2b4a41dcf19fe5 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Sat, 21 Aug 2010 15:11:06 -0700 Subject: Put up a warning and don't accept movie files if we don't have ffmpeg. This fixes ticket #973. --- modules/gallery/libraries/Form_Uploadify.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'modules/gallery/libraries/Form_Uploadify.php') 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; } -- cgit v1.2.3