diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2013-03-09 13:57:03 -0800 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2013-03-09 13:57:03 -0800 |
| commit | 451ec32555586e484030eac2051f1314806505fe (patch) | |
| tree | d9f3c4d74d99cd0b801921ddc9ab3da20dd09a35 | |
| parent | f5475535a2b4107709caeec6f74ce76465dbb632 (diff) | |
| parent | de3f9edb88aaf0486485838de1b115f2d9ac87c9 (diff) | |
Merge pull request #198 from shadlaws/followon_1935
Follow-on to #1935 - Ensure ffmpeg is executable, remove possible doubled "/"
| -rw-r--r-- | modules/gallery/helpers/movie.php | 3 | ||||
| -rw-r--r-- | modules/gallery/helpers/system.php | 1 |
2 files changed, 3 insertions, 1 deletions
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)) { |