Merge remote-tracking branch 'upstream/master' into master-upstream-sync

1 files changed, 22 insertions, 1 deletions

diff --git a/lib/private/Files/View.php b/lib/private/Files/View.php
index e9daa123470..31549c93cb2 100644
--- a/lib/private/Files/View.php
+++ b/lib/private/Files/View.php
@@ -998,7 +998,10 @@ class View {
 
 			// Create the directories if any
 			if (!$this->file_exists($filePath)) {
-				$this->mkdir($filePath);
+				$result = $this->createParentDirectories($filePath);
+				if($result === false) {
+					return false;
+				}
 			}
 
 			$source = fopen($tmpFile, 'r');
@@ -2107,4 +2110,22 @@ class View {
 		}
 		return [$uid, $filename];
 	}
+
+	/**
+	 * Creates parent non-existing folders
+	 *
+	 * @param string $filePath
+	 * @return bool
+	 */
+	private function createParentDirectories($filePath) {
+		$parentDirectory = dirname($filePath);
+		while(!$this->file_exists($parentDirectory)) {
+			$result = $this->createParentDirectories($parentDirectory);
+			if($result === false) {
+				return false;
+			}
+		}
+		$this->mkdir($filePath);
+		return true;
+	}
 }