Skip to content

[11.x] check not empty before concat url #55810

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

Draft
wants to merge 4 commits into
base: 11.x
Choose a base branch
from
Draft

[11.x] check not empty before concat url #55810

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c072fe9
if prefix is set as empty string dont add start forward slash
May 21, 2025
4e81c5e
pint
May 21, 2025
56dcb76
only concat of both not empty
May 21, 2025
185d40f
dont trim by default can break simple slash only paths
May 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/Illuminate/Filesystem/FilesystemAdapter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -847,6 +847,10 @@ public function temporaryUploadUrl($path, $expiration, array $options = [])
*/
protected function concatPathToUrl($url, $path)
{
if (empty($url) || empty($path)) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Empty is the wrong function here. It does not check if the variable us the empty string, it checks if it looks like an enmpty-ish value, inc if it's 0. One should compare against '' instead.

return $url ?: $path;
}

return rtrim($url, '/').'/'.ltrim($path, '/');
}

Expand Down
Loading