From d64eb8e612a0670e8b5ff75a0e38a624b1441a83 Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Wed, 17 Jan 2018 16:47:39 +0100 Subject: [PATCH] Convert null to empty string for Oracle in file cache accessor --- lib/private/Files/Cache/Cache.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/private/Files/Cache/Cache.php b/lib/private/Files/Cache/Cache.php index 79dd7ee56683..a64bf52c8f19 100644 --- 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])) {