From 2d8f57a1ea5e503ba04844fb24cf1c2f4576dd0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Mon, 2 Feb 2015 23:19:54 +0100 Subject: [PATCH 1/3] check if cache files are readable --- 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 4e7c065678..7bffc2cc2d 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->is_file($key)) { + if ($storage && $storage->is_readable($key)) { return true; } return false; diff --git a/lib/private/cache/fileglobal.php b/lib/private/cache/fileglobal.php index d9e0fd46d3..61902d273c 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_file($cache_dir.$key)) { + if ($cache_dir && is_readable($cache_dir.$key)) { $mtime = filemtime($cache_dir.$key); if ($mtime < time()) { unlink($cache_dir.$key); From ded8cc47cfb1173c10a47f7ab0f65fbb4ab74741 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Mon, 2 Feb 2015 23:47:59 +0100 Subject: [PATCH 2/3] :camel:case --- lib/private/cache/file.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/private/cache/file.php b/lib/private/cache/file.php index 7bffc2cc2d..b6e426989b 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->is_readable($key)) { + if ($storage && $storage->isReadable($key)) { return true; } return false; From 86935fab17a823071c4593f1b27aeb2d4df4e99c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Tue, 3 Feb 2015 10:13:25 +0100 Subject: [PATCH 3/3] 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 b6e426989b..3b500c4e45 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 61902d273c..8406adabd7 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);