From 533f9f9787a7d839ad244fa1d8093f50e852fbd3 Mon Sep 17 00:00:00 2001 From: kevin_fourie Date: Mon, 17 Mar 2008 14:02:46 +0000 Subject: [PATCH] Merged in from DEV trunk... --- lib/upgrades/UpgradeFunctions.inc.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/upgrades/UpgradeFunctions.inc.php b/lib/upgrades/UpgradeFunctions.inc.php index 7ad60ea..b39de95 100644 --- a/lib/upgrades/UpgradeFunctions.inc.php +++ b/lib/upgrades/UpgradeFunctions.inc.php @@ -1055,16 +1055,16 @@ class UpgradeFunctions { $ini->addItem('externalBinary', 'df', KT_STACK_DIR . '/bin/gnuwin32/df.exe'); } else { - $ini->addItem('externalBinary', 'xls2csv', 'xls2csv', '', 'The following are external binaries that may be used by various parts of knowledgeTree.'); - $ini->addItem('externalBinary', 'pdftotext', 'pdftotext'); - $ini->addItem('externalBinary', 'catppt', 'catppt'); - $ini->addItem('externalBinary', 'pstotext', 'pstotext'); - $ini->addItem('externalBinary', 'catdoc', 'catdoc'); - $ini->addItem('externalBinary', 'antiword', 'antiword'); - $ini->addItem('externalBinary', 'python', 'python'); - $ini->addItem('externalBinary', 'java', 'java'); - $ini->addItem('externalBinary', 'php', 'php'); - $ini->addItem('externalBinary', 'df', 'df'); + $ini->addItem('externalBinary', 'xls2csv', KT_STACK_DIR . '/common/bin/xls2csv', '', 'The following are external binaries that may be used by various parts of knowledgeTree.'); + $ini->addItem('externalBinary', 'pdftotext', KT_STACK_DIR . '/common/bin/pdftotext'); + $ini->addItem('externalBinary', 'catppt', KT_STACK_DIR . '/common/bin/catppt'); + $ini->addItem('externalBinary', 'pstotext', KT_STACK_DIR . '/common/bin/pstotext'); + $ini->addItem('externalBinary', 'catdoc', KT_STACK_DIR . '/common/bin/catdoc'); + $ini->addItem('externalBinary', 'antiword', KT_STACK_DIR . '/common/bin/antiword'); + $ini->addItem('externalBinary', 'python', KT_STACK_DIR . '/openoffice/program/python'); + $ini->addItem('externalBinary', 'java', KT_STACK_DIR . '/java/jre/bin/java'); + $ini->addItem('externalBinary', 'php', KT_STACK_DIR . '/php/bin/php'); + $ini->addItem('externalBinary', 'df', KT_STACK_DIR . '/common/bin/df'); } // search Section -- libgit2 0.21.4