Skip to content

[stable26] Fixes for getting the filename in the FileInfo class #44199

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

Merged
susnux merged 2 commits into from
Mar 14, 2024
Merged

[stable26] Fixes for getting the filename in the FileInfo class #44199

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe79686
Fixes for getting the file name in the cases when the file name key i…
hopleus Feb 19, 2024
3a88438
Refactoring getName function
hopleus Mar 12, 2024
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
Next Next commit
Fixes for getting the file name in the cases when the file name key i… 
…s received, but it is empty

Signed-off-by: hopleus <hopleus@gmail.com>
  • Loading branch information
@hopleus @backportbot
hopleus authored and backportbot[bot] committed Mar 14, 2024
commit fe796862554385936c346caec19c1d218de2a73f
6 changes: 5 additions & 1 deletion lib/private/Files/FileInfo.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,11 @@ public function getMimePart() {
* @return string
*/
public function getName() {
return isset($this->data['name']) ? $this->data['name'] : basename($this->getPath());
if (isset($this->data['name']) && !empty($this->data['name'])) {
return $this->data['name'];
}

return basename($this->getPath());
}

/**
Expand Down