From fe796862554385936c346caec19c1d218de2a73f Mon Sep 17 00:00:00 2001 From: hopleus Date: Mon, 19 Feb 2024 16:25:43 +0300 Subject: [PATCH 1/2] Fixes for getting the file name in the cases when the file name key is received, but it is empty Signed-off-by: hopleus --- lib/private/Files/FileInfo.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/private/Files/FileInfo.php b/lib/private/Files/FileInfo.php index 95de8be30abb1..f8a071d320b87 100644 --- a/lib/private/Files/FileInfo.php +++ b/lib/private/Files/FileInfo.php @@ -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()); } /** From 3a88438bedda4569b7a05f094fd7fa2bad11dacc Mon Sep 17 00:00:00 2001 From: hopleus Date: Tue, 12 Mar 2024 17:23:59 +0300 Subject: [PATCH 2/2] Refactoring getName function Signed-off-by: hopleus --- lib/private/Files/FileInfo.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/private/Files/FileInfo.php b/lib/private/Files/FileInfo.php index f8a071d320b87..05d6af9cdbe56 100644 --- a/lib/private/Files/FileInfo.php +++ b/lib/private/Files/FileInfo.php @@ -185,11 +185,9 @@ public function getMimePart() { * @return string */ public function getName() { - if (isset($this->data['name']) && !empty($this->data['name'])) { - return $this->data['name']; - } - - return basename($this->getPath()); + return empty($this->data['name']) + ? basename($this->getPath()) + : $this->data['name']; } /**