diff options
| author | Chad Parry <github@chad.parry.org> | 2011-05-18 20:30:28 -0600 |
|---|---|---|
| committer | Chad Parry <github@chad.parry.org> | 2011-05-18 20:30:28 -0600 |
| commit | 4e3964527b66d8ccd76fb261d549cd9861a7a780 (patch) | |
| tree | f892c18f7abaa141a25a2ca6b2426c9f90bb7af0 | |
| parent | e9862d8fbc4d6fd06abf157f48dce671a7283993 (diff) | |
Initialize legal file arrays correctly.
| -rw-r--r-- | modules/gallery/helpers/legal_file.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/modules/gallery/helpers/legal_file.php b/modules/gallery/helpers/legal_file.php index 5d10dffd..0d3e9728 100644 --- a/modules/gallery/helpers/legal_file.php +++ b/modules/gallery/helpers/legal_file.php @@ -37,7 +37,7 @@ class legal_file_Core { static function get_extensions() { $extensions = legal_file::get_photo_extensions(); if (movie::find_ffmpeg()) { - array_push($extensions, legal_file::get_movie_extensions()); + $extensions = array_merge($extensions, legal_file::get_movie_extensions()); } return $extensions; } @@ -53,8 +53,9 @@ class legal_file_Core { static function get_photo_types() { // Create a default list of allowed types and then let modules modify it. $types_wrapper = new stdClass(); - module::event("legal_photo_types", $types_wrapper); $types_wrapper->types = array("image/jpeg", "image/gif", "image/png"); + module::event("legal_photo_types", $types_wrapper); + return $types_wrapper->types; } static function get_movie_types() { |