From 86935fab17a823071c4593f1b27aeb2d4df4e99c Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Tue, 3 Feb 2015 10:13:25 +0100 Subject: [PATCH] readd is_file --- lib/private/cache/file.php | 2 +- lib/private/cache/fileglobal.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/private/cache/file.php b/lib/private/cache/file.php index b6e426989b8..3b500c4e45b 100644 --- a/lib/private/cache/file.php +++ b/lib/private/cache/file.php @@ -83,7 +83,7 @@ class File { public function hasKey($key) { $storage = $this->getStorage(); - if ($storage && $storage->isReadable($key)) { + if ($storage && $storage->is_file($key) && $storage->isReadable($key)) { return true; } return false; diff --git a/lib/private/cache/fileglobal.php b/lib/private/cache/fileglobal.php index 61902d273c7..8406adabd75 100644 --- a/lib/private/cache/fileglobal.php +++ b/lib/private/cache/fileglobal.php @@ -52,7 +52,7 @@ class FileGlobal { public function hasKey($key) { $key = $this->fixKey($key); $cache_dir = self::getCacheDir(); - if ($cache_dir && is_readable($cache_dir.$key)) { + if ($cache_dir && is_file($cache_dir.$key) && is_readable($cache_dir.$key)) { $mtime = filemtime($cache_dir.$key); if ($mtime < time()) { unlink($cache_dir.$key); -- 2.39.5