Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use the same path roots when calling makePathRelative #752

Merged
merged 7 commits into from Apr 19, 2017
Merged

Use the same path roots when calling makePathRelative #752

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4dfee18
Merge pull request #4 from contao/master
Nov 30, 2016
06653d2
Merge pull request #10 from contao/master
Dec 23, 2016
da09c80
Merge branch 'master' of https://github.com/contao/core-bundle into c…
Feb 20, 2017
bc72081
Merge branch 'contao-master' into agoat/dev-4.3.5
Feb 20, 2017
00dfdd7
Merge branch 'master' of https://github.com/contao/core-bundle into c…
Mar 24, 2017
3e709bf
Merge branch 'contao-master' into upstream/master
Mar 24, 2017
e635ed1
Use absolute path roots for makePathRelative
Apr 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Util/SymlinkUtil.php
View file
Open in desktop
Expand Up @@ -38,7 +38,7 @@ public static function symlink($target, $link, $rootDir)
if ('\\' === DIRECTORY_SEPARATOR) {
$fs->symlink($rootDir.'/'.$target, $rootDir.'/'.$link);
} else {
$fs->symlink(rtrim($fs->makePathRelative($target, dirname($link)), '/'), $rootDir.'/'.$link);
$fs->symlink(rtrim($fs->makePathRelative($rootDir.'/'.$target, dirname($rootDir.'/'.$link)), '/'), $rootDir.'/'.$link);
}
}

Expand Down