From 35dcda36a35e15ce44dfef15724b9d5392f14346 Mon Sep 17 00:00:00 2001 From: Côme Chilliet Date: Tue, 25 Jan 2022 09:36:22 +0100 Subject: Fix OC\Files\Storage\DAV::hasUpdated when cache is not set MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes the test OCA\Files_External\Tests\Storage\WebdavTest::testStat on PHP>=7.4 Signed-off-by: Côme Chilliet --- lib/private/Files/Storage/DAV.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/private/Files/Storage/DAV.php b/lib/private/Files/Storage/DAV.php index 161f346e52f..a065f55ae08 100644 --- a/lib/private/Files/Storage/DAV.php +++ b/lib/private/Files/Storage/DAV.php @@ -796,7 +796,7 @@ class DAV extends Common { if (isset($response['{DAV:}getetag'])) { $etag = trim($response['{DAV:}getetag'], '"'); } - if (!empty($etag) && $cachedData['etag'] !== $etag) { + if (($cachedData === false) || (!empty($etag) && ($cachedData['etag'] !== $etag))) { return true; } elseif (isset($response['{http://open-collaboration-services.org/ns}share-permissions'])) { $sharePermissions = (int)$response['{http://open-collaboration-services.org/ns}share-permissions']; -- cgit v1.2.3 From 5cca86ce1946d68c688b3adbd34f379627138368 Mon Sep 17 00:00:00 2001 From: Côme Chilliet Date: Tue, 25 Jan 2022 09:50:26 +0100 Subject: Remove redundant if clause MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Côme Chilliet --- lib/private/Files/Storage/DAV.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/private/Files/Storage/DAV.php b/lib/private/Files/Storage/DAV.php index a065f55ae08..b4a85755b20 100644 --- a/lib/private/Files/Storage/DAV.php +++ b/lib/private/Files/Storage/DAV.php @@ -792,10 +792,7 @@ class DAV extends Common { } if (isset($response['{DAV:}getetag'])) { $cachedData = $this->getCache()->get($path); - $etag = null; - if (isset($response['{DAV:}getetag'])) { - $etag = trim($response['{DAV:}getetag'], '"'); - } + $etag = trim($response['{DAV:}getetag'], '"'); if (($cachedData === false) || (!empty($etag) && ($cachedData['etag'] !== $etag))) { return true; } elseif (isset($response['{http://open-collaboration-services.org/ns}share-permissions'])) { -- cgit v1.2.3