Merge pull request #47625 from nextcloud/backport/47581/stable30

AndyScherzinger · web-flow · commit 073b792dbfce · 2024-09-03T01:29:35.000+02:00
[stable30] fix: Do not fail to get internal path on NonExistingFile
diff --git a/lib/private/Files/Node/NonExistingFile.php b/lib/private/Files/Node/NonExistingFile.php
@@ -38,6 +38,14 @@ public function getId() {
 		}
 	}
 
+	public function getInternalPath() {
+		if ($this->fileInfo) {
+			return parent::getInternalPath();
+		} else {
+			return $this->getParent()->getMountPoint()->getInternalPath($this->getPath());
+		}
+	}
+
 	public function stat() {
 		throw new NotFoundException();
 	}
diff --git a/lib/private/Files/Node/NonExistingFolder.php b/lib/private/Files/Node/NonExistingFolder.php
@@ -38,6 +38,14 @@ public function getId() {
 		}
 	}
 
+	public function getInternalPath() {
+		if ($this->fileInfo) {
+			return parent::getInternalPath();
+		} else {
+			return $this->getParent()->getMountPoint()->getInternalPath($this->getPath());
+		}
+	}
+
 	public function stat() {
 		throw new NotFoundException();
 	}

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,14 @@ public function getId() {`
`38`	`38`	`}`
`39`	`39`	`}`
`40`	`40`
	`41`	`+ public function getInternalPath() {`
	`42`	`+ if ($this->fileInfo) {`
	`43`	`+ return parent::getInternalPath();`
	`44`	`+ } else {`
	`45`	`+ return $this->getParent()->getMountPoint()->getInternalPath($this->getPath());`
	`46`	`+ }`
	`47`	`+ }`
	`48`	`+`
`41`	`49`	`public function stat() {`
`42`	`50`	`throw new NotFoundException();`
`43`	`51`	`}`