diff options
| author | shadlaws <shad@shadlaws.com> | 2013-03-09 15:59:23 +0100 |
|---|---|---|
| committer | shadlaws <shad@shadlaws.com> | 2013-03-09 15:59:23 +0100 |
| commit | de3f9edb88aaf0486485838de1b115f2d9ac87c9 (patch) | |
| tree | d9f3c4d74d99cd0b801921ddc9ab3da20dd09a35 /modules/gallery/helpers/system.php | |
| parent | f5475535a2b4107709caeec6f74ce76465dbb632 (diff) | |
Follow-on to #1935 - Ensure ffmpeg is executable, remove possible doubled "/".
- movie::find_ffmpeg - made it use is_executable instead of just file_exists.
- system::find_binary - removed possible doubled "/" in paths.
Diffstat (limited to 'modules/gallery/helpers/system.php')
| -rw-r--r-- | modules/gallery/helpers/system.php | 1 |
1 files changed, 1 insertions, 0 deletions
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)) { |