diff options
| author | Nathan Kinkade <nath@nkinka.de> | 2013-02-14 14:28:46 +0000 |
|---|---|---|
| committer | Nathan Kinkade <nath@nkinka.de> | 2013-02-14 14:28:46 +0000 |
| commit | 711651f727e093cc7357a6bbff6bd992fd6dfd80 (patch) | |
| tree | 2dadc1c06acf1ab3d42d3ed5415568535db54416 /modules/gallery/libraries/Form_Uploadify.php | |
| parent | 0047af90bf4db08b22838e6ded22a7fa70cee98a (diff) | |
| parent | e5ed05004f005bdccdbf68e199ae2324ad97e895 (diff) | |
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'modules/gallery/libraries/Form_Uploadify.php')
| -rw-r--r-- | modules/gallery/libraries/Form_Uploadify.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/gallery/libraries/Form_Uploadify.php b/modules/gallery/libraries/Form_Uploadify.php index c7b856f9..1e58018d 100644 --- a/modules/gallery/libraries/Form_Uploadify.php +++ b/modules/gallery/libraries/Form_Uploadify.php @@ -1,7 +1,7 @@ <?php defined("SYSPATH") or die("No direct script access."); /** * Gallery - a web based photo album viewer and editor - * Copyright (C) 2000-2012 Bharat Mediratta + * Copyright (C) 2000-2013 Bharat Mediratta * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -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"); |