diff options
| -rw-r--r-- | _test/cases/inc/init_fullpath.test.php | 40 | ||||
| -rw-r--r-- | inc/init.php | 2 |
2 files changed, 21 insertions, 21 deletions
diff --git a/_test/cases/inc/init_fullpath.test.php b/_test/cases/inc/init_fullpath.test.php index 944d6bd02..63394b09d 100644 --- a/_test/cases/inc/init_fullpath.test.php +++ b/_test/cases/inc/init_fullpath.test.php @@ -44,26 +44,26 @@ class init_fullpath_test extends UnitTestCase { // paths to check $tests = array( - 'c:foo/bar/baz' => 'c:foo/bar/baz', - 'c:foo//bar/baz' => 'c:foo/bar/baz', - 'c:foo/../bar/baz' => 'c:bar/baz', - 'c:foo/./bar/baz' => 'c:foo/bar/baz', - 'c:foo/bar/..' => 'c:foo', - 'c:foo/bar/../../../baz' => 'c:baz', - - 'c:/foo/bar/baz' => 'c:foo/bar/baz', - 'c:/foo//bar/baz' => 'c:foo/bar/baz', - 'c:/foo/../bar/baz' => 'c:bar/baz', - 'c:/foo/./bar/baz' => 'c:foo/bar/baz', - 'c:/foo/bar/..' => 'c:foo', - 'c:/foo/bar/../../../baz' => 'c:baz', - - 'c:\\foo\\bar\\baz' => 'c:foo/bar/baz', - 'c:\\foo\\\\bar\\baz' => 'c:foo/bar/baz', - 'c:\\foo\\..\\bar\\baz' => 'c:bar/baz', - 'c:\\foo\\.\\bar\\baz' => 'c:foo/bar/baz', - 'c:\\foo\\bar\\..' => 'c:foo', - 'c:\\foo\\bar\\..\\..\\..\\baz' => 'c:baz', + 'c:foo/bar/baz' => 'c:/foo/bar/baz', + 'c:foo//bar/baz' => 'c:/foo/bar/baz', + 'c:foo/../bar/baz' => 'c:/bar/baz', + 'c:foo/./bar/baz' => 'c:/foo/bar/baz', + 'c:foo/bar/..' => 'c:/foo', + 'c:foo/bar/../../../baz' => 'c:/baz', + + 'c:/foo/bar/baz' => 'c:/foo/bar/baz', + 'c:/foo//bar/baz' => 'c:/foo/bar/baz', + 'c:/foo/../bar/baz' => 'c:/bar/baz', + 'c:/foo/./bar/baz' => 'c:/foo/bar/baz', + 'c:/foo/bar/..' => 'c:/foo', + 'c:/foo/bar/../../../baz' => 'c:/baz', + + 'c:\\foo\\bar\\baz' => 'c:/foo/bar/baz', + 'c:\\foo\\\\bar\\baz' => 'c:/foo/bar/baz', + 'c:\\foo\\..\\bar\\baz' => 'c:/bar/baz', + 'c:\\foo\\.\\bar\\baz' => 'c:/foo/bar/baz', + 'c:\\foo\\bar\\..' => 'c:/foo', + 'c:\\foo\\bar\\..\\..\\..\\baz' => 'c:/baz', '\\\\server\\share/foo/bar/baz' => '\\\\server\\share/foo/bar/baz', '\\\\server\\share/foo//bar/baz' => '\\\\server\\share/foo/bar/baz', diff --git a/inc/init.php b/inc/init.php index f577188e8..b64a6611a 100644 --- a/inc/init.php +++ b/inc/init.php @@ -533,7 +533,7 @@ function fullpath($path,$exists=false){ }elseif($iswin){ // match drive letter and UNC paths if(preg_match('!^([a-zA-z]:)(.*)!',$path,$match)){ - $root = $match[1]; + $root = $match[1].'/'; $path = $match[2]; }else if(preg_match('!^(\\\\\\\\[^\\\\/]+\\\\[^\\\\/]+[\\\\/])(.*)!',$path,$match)){ $root = $match[1]; |