diff options
| author | Nathan Kinkade <nath@nkinka.de> | 2011-08-11 19:07:45 +0000 |
|---|---|---|
| committer | Nathan Kinkade <nath@nkinka.de> | 2011-08-11 19:07:45 +0000 |
| commit | d8dffba94277c2179a59eb72d6927a5bdb879648 (patch) | |
| tree | d377bd9d2e1e277ca93cc7fc17c73edae5286706 /modules/gallery/libraries/Form_Uploadify.php | |
| parent | 2ec6e8d61b63ac5d3fc5cbd6761360539cd9d5e9 (diff) | |
| parent | a5b1972bbe9676479886ca94bb23f09407a87561 (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 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/modules/gallery/libraries/Form_Uploadify.php b/modules/gallery/libraries/Form_Uploadify.php index 3e35e380..450320b3 100644 --- a/modules/gallery/libraries/Form_Uploadify.php +++ b/modules/gallery/libraries/Form_Uploadify.php @@ -47,6 +47,7 @@ class Form_Uploadify_Core extends Form_Input { $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->extensions = legal_file::get_filters(); $v->suhosin_session_encrypt = (bool) ini_get("suhosin.session.encrypt"); list ($toolkit_max_filesize_bytes, $toolkit_max_filesize) = graphics::max_filesize(); |