diff options
| -rw-r--r-- | .build_number | 2 | ||||
| -rw-r--r-- | modules/gallery/helpers/movie.php | 3 | ||||
| -rw-r--r-- | modules/gallery/helpers/system.php | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/.build_number b/.build_number index ea0c3104..cfc3aff1 100644 --- a/.build_number +++ b/.build_number @@ -3,4 +3,4 @@ ; process. You don't need to edit it. In fact.. ; ; DO NOT EDIT THIS FILE BY HAND! -build_number=383 +build_number=384 diff --git a/modules/gallery/helpers/movie.php b/modules/gallery/helpers/movie.php index aff2acc1..2f190881 100644 --- a/modules/gallery/helpers/movie.php +++ b/modules/gallery/helpers/movie.php @@ -138,7 +138,8 @@ class movie_Core { * Return the path to the ffmpeg binary if one exists and is executable, or null. */ static function find_ffmpeg() { - if (!($ffmpeg_path = module::get_var("gallery", "ffmpeg_path")) || !file_exists($ffmpeg_path)) { + if (!($ffmpeg_path = module::get_var("gallery", "ffmpeg_path")) || + !@is_executable($ffmpeg_path)) { $ffmpeg_path = system::find_binary( "ffmpeg", module::get_var("gallery", "graphics_toolkit_path")); module::set_var("gallery", "ffmpeg_path", $ffmpeg_path); diff --git a/modules/gallery/helpers/system.php b/modules/gallery/helpers/system.php index 7d56466e..f0879d6a 100644 --- a/modules/gallery/helpers/system.php +++ b/modules/gallery/helpers/system.php @@ -47,6 +47,7 @@ class system_Core { explode(":", module::get_var("gallery", "extra_binary_paths"))); foreach ($paths as $path) { + $path = rtrim($path, "/"); $candidate = "$path/$binary"; // @suppress errors below to avoid open_basedir issues if (@file_exists($candidate)) { |