From 68e369cdd725f549648b59264a4b7f62a4dd9be1 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Tue, 22 Feb 2011 13:09:09 +0000 Subject: [PATCH] use /usr/bin/tnef if available, before search tnef or ytnef via which in the path, to cope with system having it NOT in the path, but at its standard location --- setup/check_install.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/setup/check_install.php b/setup/check_install.php index 9c610fcfd7..8b0194cf08 100644 --- a/setup/check_install.php +++ b/setup/check_install.php @@ -678,7 +678,12 @@ function tnef_check($name,$args) $available = false; $tnef = array(); - if (exec("which tnef", $tnef)) + if (file_exists('/usr/bin/tnef')) + { + $available = true; + $tnef[] = '/usr/bin/tnef'; + } + elseif (exec("which tnef", $tnef)) { $available = true; }