From edf806b98d675a2037b019644aff76b7e8b7738c Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 21 Nov 2011 02:33:09 -0500
Subject: [PATCH] Merged revisions 2741-2788 from SVN stable branch.

---
 install/lib/install.lib.php |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/install/lib/install.lib.php b/install/lib/install.lib.php
index 318cda9..0d8eb40 100644
--- a/install/lib/install.lib.php
+++ b/install/lib/install.lib.php
@@ -582,8 +582,8 @@
 }
 
 function is_installed($appname) {
-	exec('which '.escapeshellcmd($appname).' 2> /dev/null',$out);
-	if(isset($out[0]) && stristr($out[0],$appname)) {
+	exec('which '.escapeshellcmd($appname).' 2> /dev/null',$out,$returncode);
+	if(isset($out[0]) && stristr($out[0],$appname) && $returncode == 0) {
 		return true;
 	} else {
 		return false;

--
Gitblit v1.9.1