summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2010-08-21 15:10:46 -0700
committerBharat Mediratta <bharat@menalto.com>2010-08-21 15:10:46 -0700
commit4a01aaddc9fa443ca9e022666078d8a2d0578d8a (patch)
tree55850ca1f956b84bd2960a62956bff878905189c
parent7c1a716f0160ee4c0638e28695373bdc164ee40c (diff)
Verify that the ffmpeg path still exists by using file_exists(). This
is a lightweight way to catch the case where ffmpeg gets deleted. Fixes ticket #1303.
-rw-r--r--modules/gallery/helpers/movie.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/gallery/helpers/movie.php b/modules/gallery/helpers/movie.php
index 4ff29a7b..3e55eefe 100644
--- a/modules/gallery/helpers/movie.php
+++ b/modules/gallery/helpers/movie.php
@@ -84,7 +84,7 @@ class movie_Core {
}
static function find_ffmpeg() {
- if (!$ffmpeg_path = module::get_var("gallery", "ffmpeg_path")) {
+ if (!($ffmpeg_path = module::get_var("gallery", "ffmpeg_path")) || !file_exists($ffmpeg_path)) {
$graphics_path = module::get_var("gallery", "graphics_toolkit_path", null);
putenv("PATH=" . getenv("PATH") . (empty($graphics_path) ? "" : ":$graphics_path") .