Merge pull request #30224 from owncloud/stable10-trashbin-check-perms

[stable10] Convert null to empty string for Oracle in file cache accessor
owncloud · Jan 23, 2018 · 036f541 · 036f541
2 parents e20062a + d64eb8e
commit 036f541
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/lib/private/Files/Cache/Cache.php b/lib/private/Files/Cache/Cache.php
@@ -151,6 +151,13 @@ public function get($file) {
 				$data['storage_mtime'] = $data['mtime'];
 			}
 			$data['permissions'] = (int)$data['permissions'];
+			// Oracle stores empty strings as null...
+			if (is_null($data['name'])) {
+				$data['name'] = '';
+			}
+			if (is_null($data['path'])) {
+				$data['path'] = '';
+			}
 			return new CacheEntry($data);
 		} else if (!$data and is_string($file)) {
 			if (isset($this->partial[$file])) {