merged branch jakzal/file-bugfix (PR #9019)
This PR was merged into the 2.2 branch.
Discussion
----------
[HttpFoundation] Fixed the way path to directory is trimmed
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | re #8388
| License | MIT
| Doc PR | -
Commits
-------
773e716
[HttpFoundation] Fixed the way path to directory is trimmed.
This commit is contained in:
commit
56250d3bdc
@ -129,7 +129,7 @@ class File extends \SplFileInfo
|
|||||||
throw new FileException(sprintf('Unable to write in the "%s" directory', $directory));
|
throw new FileException(sprintf('Unable to write in the "%s" directory', $directory));
|
||||||
}
|
}
|
||||||
|
|
||||||
$target = trim($directory, '/\\').DIRECTORY_SEPARATOR.(null === $name ? $this->getBasename() : $this->getName($name));
|
$target = rtrim($directory, '/\\').DIRECTORY_SEPARATOR.(null === $name ? $this->getBasename() : $this->getName($name));
|
||||||
|
|
||||||
return new File($target, false);
|
return new File($target, false);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user