diff options
| author | Nathan Kinkade <nath@nkinka.de> | 2012-05-12 13:06:18 +0000 |
|---|---|---|
| committer | Nathan Kinkade <nath@nkinka.de> | 2012-05-12 13:06:18 +0000 |
| commit | f5098f54b8279f468d94747b1156e15ea05d6d25 (patch) | |
| tree | 2ecfb6663887ffbc72de8f231864b6c78bd62640 /modules/gallery/helpers/graphics.php | |
| parent | a13fd7f373f3718037a2ce90a3cb408f24856602 (diff) | |
| parent | d1390bd87db1a7e59bbd72f5991fbbc6374c98b4 (diff) | |
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'modules/gallery/helpers/graphics.php')
| -rw-r--r-- | modules/gallery/helpers/graphics.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php index 7e0bbbea..c19fbe6d 100644 --- a/modules/gallery/helpers/graphics.php +++ b/modules/gallery/helpers/graphics.php @@ -156,12 +156,12 @@ class graphics_Core { foreach ($ops as $target => $output_file) { if ($input_item->is_movie()) { // Convert the movie to a JPG first - $output_file = preg_replace("/...$/", "jpg", $output_file); + $output_file = legal_file::change_extension($output_file, "jpg"); try { movie::extract_frame($input_file, $output_file); } catch (Exception $e) { // Assuming this is MISSING_FFMPEG for now - copy(MODPATH . "gallery/images/missing_movie.png", $output_file); + copy(MODPATH . "gallery/images/missing_movie.jpg", $output_file); } $working_file = $output_file; } else { |