From c45aac155fd682f9253e9e352a482facedde7add Mon Sep 17 00:00:00 2001
From: Megan Watson <megan@knowledgetree.com>
Date: Thu, 8 May 2008 10:29:29 +0000
Subject: [PATCH] KTS-3337 "Text extractors using incorrect Python binary because of config.ini option" Fixed. The stack is now checked before the config.ini option.

---
 lib/util/ktutil.inc | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/lib/util/ktutil.inc b/lib/util/ktutil.inc
index 5e0cd49..1c0a5f4 100644
--- a/lib/util/ktutil.inc
+++ b/lib/util/ktutil.inc
@@ -8,31 +8,31 @@
  * Document Management Made Simple
  * Copyright (C) 2008 KnowledgeTree Inc.
  * Portions copyright The Jam Warehouse Software (Pty) Limited
- * 
+ *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
  * Free Software Foundation.
- * 
+ *
  * This program is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
  * details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco, 
+ *
+ * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
  * California 94120-7775, or email info@knowledgetree.com.
- * 
+ *
  * The interactive user interfaces in modified source and object code versions
  * of this program must display Appropriate Legal Notices, as required under
  * Section 5 of the GNU General Public License version 3.
- * 
+ *
  * In accordance with Section 7(b) of the GNU General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "Powered by
- * KnowledgeTree" logo and retain the original copyright notice. If the display of the 
+ * KnowledgeTree" logo and retain the original copyright notice. If the display of the
  * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
- * must display the words "Powered by KnowledgeTree" and retain the original 
+ * must display the words "Powered by KnowledgeTree" and retain the original
  * copyright notice.
  * Contributor( s): ______________________________________
  */
@@ -727,6 +727,13 @@ class KTUtil {
 
     // {{{ findCommand
     function findCommand($sConfigVar, $sDefault = null) {
+        // Check for the stack command before using the user defined command
+        $result = KTUtil::checkForStackCommand($sConfigVar);
+    	if (!empty($result))
+    	{
+    		return $result;
+    	}
+
     	$oKTConfig =& KTConfig::getSingleton();
     	$sCommand = $oKTConfig->get($sConfigVar, $sDefault);
     	if (empty($sCommand)) {
@@ -739,12 +746,6 @@ class KTUtil {
     		return $sCommand . ".exe";
     	}
 
-    	$result = KTUtil::checkForStackCommand($sConfigVar);
-    	if (!empty($result))
-    	{
-    		return $result;
-    	}
-
     	$sExecSearchPath = $oKTConfig->get("KnowledgeTree/execSearchPath");
     	$sExecSearchPath .= PATH_SEPARATOR . KT_DIR . "/../common/";
     	$sExecSearchPath .= PATH_SEPARATOR . KT_DIR . "/../bin/xpdf/";
--
libgit2 0.21.4