[PHP-DOC] cvs: phpdoc /scripts file-entities.php.in

[Hannes Magnusson]

bjori           Sat Sep  8 17:40:14 2007 UTC

  Modified files:              
    /phpdoc/scripts     file-entities.php.in 
  Log:
  Don't prepend /cygdrive/ to the path if we aren't running cygwin
  # (This commit message was written in notepad, how cool am I!)
  
  
http://cvs.php.net/viewvc.cgi/phpdoc/scripts/file-entities.php.in?r1=1.44&r2=1.45&diff_format=u
Index: phpdoc/scripts/file-entities.php.in
diff -u phpdoc/scripts/file-entities.php.in:1.44 
phpdoc/scripts/file-entities.php.in:1.45
--- phpdoc/scripts/file-entities.php.in:1.44    Wed Jun 20 22:25:41 2007
+++ phpdoc/scripts/file-entities.php.in Sat Sep  8 17:40:14 2007
@@ -17,7 +17,7 @@
   |             Gabor Hojtsy <[EMAIL PROTECTED]>                              |
   +----------------------------------------------------------------------+
   
-  $Id: file-entities.php.in,v 1.44 2007/06/20 22:25:41 bjori Exp $
+  $Id: file-entities.php.in,v 1.45 2007/09/08 17:40:14 bjori Exp $
 */
 
 /**
@@ -50,7 +50,7 @@
 
 // The dir for PHP. If the cygwin wasn't compiled on Cygwin, the path needs to 
be stripped.
 $out_dir = ($not_windows || eregi('CYGWIN',php_uname()))? "@WORKDIR@" : 
abs_path(strip_cygdrive("@WORKDIR@"));
-
+var_dump($out_dir, "@WORKDIR@", $not_windows);
 // The language encoding to use
 $encoding = "@ENCODING@";
 
@@ -395,7 +395,7 @@
     if ($GLOBALS['not_windows'])
        return $path;
 
-    if ((bool)@WINJADE@) {
+    if ((bool)@WINJADE@ || stripos(PHP_OS, "cygwin") === false) {
         return strip_cygdrive($path);
     } else {
         return preg_replace('@^([a-zA-Z]):/@S', '/cygdrive/$1/', $path);