Merge pull request #44199 from nextcloud/backport/43652/stable26

[stable26] Fixes for getting the filename in the FileInfo class
3 months ago · f1da90fce6
parent 2d276c8a65 3a88438bed
commit f1da90fce6
1 changed files with 3 additions and 1 deletions
--- a/lib/private/Files/FileInfo.php
+++ b/lib/private/Files/FileInfo.php
@ -185,7 +185,9 @@ class FileInfo implements \OCP\Files\FileInfo, \ArrayAccess {
 	 * @return string
 	 */
 	public function getName() {
-		return isset($this->data['name']) ? $this->data['name'] : basename($this->getPath());
+		return empty($this->data['name'])
+			? basename($this->getPath())
+			: $this->data['name'];
 	}

 	/**