Fixed bug #12547: Removed wrong default binary search paths for Windows
authorFrancois Suter <francois.suter@typo3.org>
Wed, 25 Nov 2009 09:36:55 +0000 (09:36 +0000)
committerFrancois Suter <francois.suter@typo3.org>
Wed, 25 Nov 2009 09:36:55 +0000 (09:36 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@6521 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
t3lib/class.t3lib_exec.php

index 39ad428..be92e69 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-11-24  Francois Suter  <francois@typo3.org>
+
+       * Fixed bug #12547: Removed wrong default binary search paths for Windows
+
 2009-11-25  Oliver Hader  <oliver@typo3.org>
 
        * Follow-up to bugfix #12436: Move Suhosin part to php.ini section in the install tool
index c1c0fe0..39259a1 100644 (file)
@@ -370,20 +370,14 @@ class t3lib_exec {
                        }
                }
 
-               if (TYPO3_OS=='WIN') {
-// TODO: add the most common paths for WIN
-                       $sysPathArr = array_merge($sysPathArr, array (
-                               '/usr/bin/' => '/usr/bin/',
-                               '/perl/bin/' => '/perl/bin/',
-                       ));
-               } else { // UNIX
-                       $sysPathArr = array_merge($sysPathArr, array (
+                       // Set common paths for Unix (only)
+               if (TYPO3_OS !== 'WIN') {
+                       $sysPathArr = array_merge($sysPathArr, array(
                                '/usr/bin/' => '/usr/bin/',
                                '/usr/local/bin/' => '/usr/local/bin/',
                        ));
                }
 
-
                $pathsArr = array_merge($pathsArr, $sysPathArr);
 
                return $pathsArr;