[svn-components] 7103 - in /trunk/Base: ChangeLog design/class_diagram.png src/features.php

[Derick Rethans]

Author: dr
Date: Tue Jan  8 13:45:13 2008
New Revision: 7103

Log:
- Fixed issue #12329: ezcBaseFeatures::findExecutableInPath's return value
  does not include the extension to the executable at the end on Windows.

Modified:
    trunk/Base/ChangeLog
    trunk/Base/design/class_diagram.png
    trunk/Base/src/features.php

Modified: trunk/Base/ChangeLog
==============================================================================
--- trunk/Base/ChangeLog [iso-8859-1] (original)
+++ trunk/Base/ChangeLog [iso-8859-1] Tue Jan  8 13:45:13 2008
@@ -3,6 +3,8 @@
 
 - Fixed issue #11448: ezc_bootsrap.php uses relative paths. 
 - Fixed issue #12316: Numbers in own component prefix not possible.
+- Fixed issue #12329: ezcBaseFeatures::findExecutableInPath's return value
+  does not include the extension to the executable at the end on Windows.
 
 
 1.4 - Monday 17 December 2007

Modified: trunk/Base/design/class_diagram.png
==============================================================================
Binary files - no diff available.

Modified: trunk/Base/src/features.php
==============================================================================
--- trunk/Base/src/features.php [iso-8859-1] (original)
+++ trunk/Base/src/features.php [iso-8859-1] Tue Jan  8 13:45:13 2008
@@ -255,11 +255,11 @@
     }
 
     /**
-     * Returns the path to the specified filename based on the os.
-     *
-     * It scans the PATH enviroment variable based on the os to find the 
$fileName.
-     * For Windows, the path is with \, not /.
-     * If $fileName is not found, it returns null.
+     * Returns the path of the specified executable, if it can be found in the 
system's path.
+     *
+     * It scans the PATH enviroment variable based on the OS to find the
+     * $fileName. For Windows, the path is with \, not /.  If $fileName is not
+     * found, it returns null.
      *
      * @todo consider using getenv( 'PATH' ) instead of $_ENV['PATH']
      *       (but that won't work under IIS)
@@ -313,13 +313,13 @@
                     {
                         if ( file_exists( "{$dir}\\{$fileName}.exe" ) )
                         {
-                            return "{$dir}\\{$fileName}";
+                            return "{$dir}\\{$fileName}.exe";
                         }
                     }
                 }
                 elseif ( file_exists( "{$fileName}.exe" ) )
                 {
-                    return $fileName;
+                    return "{$fileName}.exe";
                 }
                 break;
         }


-- 
svn-components mailing list
svn-components@lists.ez.no
http://lists.ez.no/mailman/listinfo/svn-components