From: Pierre Joye <pajoye@php.net>
Date: Tue, 26 Jul 2011 07:30:41 +0000 (+0000)
Subject: - use cwd_expand now
X-Git-Tag: php-5.4.0alpha3~60
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5107df2d0443cb7bcb5817c03e2625a169ffd003;p=php

- use cwd_expand now
---

diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c
index 81de56c7ce..21986e171b 100755
--- a/ext/spl/spl_directory.c
+++ b/ext/spl/spl_directory.c
@@ -1219,10 +1219,7 @@ SPL_METHOD(SplFileInfo, getLinkTarget)
 #if defined(PHP_WIN32) || HAVE_SYMLINK
 	if (!IS_ABSOLUTE_PATH(intern->file_name, intern->file_name_len)) {
 		char expanded_path[MAXPATHLEN];
-
-		/* TODO: Fix expand_filepath to do not resolve links but only expand the path 
-		   (Pierre) */
-		if (!expand_filepath(intern->file_name, expanded_path TSRMLS_CC)) {
+		if (!expand_filepath_with_mode(intern->file_name, expanded_path, NULL, 0, CWD_EXPAND  TSRMLS_CC)) {
 			php_error_docref(NULL TSRMLS_CC, E_WARNING, "No such file or directory");
 			RETURN_FALSE;
 		}