From ea6f8f46276e96b1b9dcac343688ccf89af9c755 Mon Sep 17 00:00:00 2001
From: Jarrett Jordaan <jarrett@knowledgetree.com>
Date: Tue, 10 Nov 2009 15:47:48 +0200
Subject: [PATCH] KTS4498-Updated windows paths

---
 setup/wizard/installUtil.php | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+), 0 deletions(-)

diff --git a/setup/wizard/installUtil.php b/setup/wizard/installUtil.php
index 3deb12d..dbe57fe 100644
--- a/setup/wizard/installUtil.php
+++ b/setup/wizard/installUtil.php
@@ -776,6 +776,26 @@ class InstallUtil {
 				$jvm = $zendsys."jre".DS."bin".DS."client".DS."jvm.dll";
 				if(file_exists($jvm))
 					return $jvm;
+	    	}
+	    }
+
+	    return false;
+    }
+
+    public function useZendJava() {
+	    if($this->installEnvironment() == 'Zend') {
+	    	if(WINDOWS_OS) { // For Zend Installation only
+				$sysdir = explode(DS, SYSTEM_DIR);
+				array_pop($sysdir);
+				array_pop($sysdir);
+				array_pop($sysdir);
+				$zendsys = '';
+				foreach ($sysdir as $v) {
+					$zendsys .= $v.DS;
+				}
+				$jvm = $zendsys."jre".DS."bin".DS."client".DS."jvm.dll";
+				if(file_exists($jvm))
+					return $jvm;
 	    	} else {
 	    		$java = "/usr/bin/java";
 	    		if(file_exists($java)) {
@@ -919,5 +939,8 @@ class InstallUtil {
         return join(" ", $aSafeArgs);
     }
 
+    /*
+    Just Because.
+    */
 }
 ?>
--
libgit2 0.21.4