From 1901ac8b17c99eef3ccd99edf877fd0a86737d17 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 21 Oct 2012 00:13:16 +0200
Subject: [PATCH] drop depricated is_readable and is_writable
---
lib/files.php | 2 +-
lib/files/filesystem.php | 14 --------------
lib/files/view.php | 14 --------------
lib/filesystem.php | 7 -------
4 files changed, 1 insertion(+), 36 deletions(-)
diff --git a/lib/files.php b/lib/files.php
index 28c8d0b449..ba111bee96 100644
--- a/lib/files.php
+++ b/lib/files.php
@@ -178,7 +178,7 @@ class OC_Files {
$filename=$dir.'/'.$files;
}
@ob_end_clean();
- if($zip or \OC\Files\Filesystem::is_readable($filename)) {
+ if($zip or \OC\Files\Filesystem::isReadable($filename)) {
header('Content-Disposition: attachment; filename="'.basename($filename).'"');
header('Content-Transfer-Encoding: binary');
OC_Response::disableCaching();
diff --git a/lib/files/filesystem.php b/lib/files/filesystem.php
index 94e8a56256..0dae774feb 100644
--- a/lib/files/filesystem.php
+++ b/lib/files/filesystem.php
@@ -440,20 +440,6 @@ class Filesystem {
return self::$defaultInstance->readfile($path);
}
- /**
- * @deprecated Replaced by isReadable() as part of CRUDS
- */
- static public function is_readable($path) {
- return self::$defaultInstance->isReadable($path);
- }
-
- /**
- * @deprecated Replaced by isCreatable(), isUpdatable(), isDeletable() as part of CRUDS
- */
- static public function is_writable($path) {
- return self::$defaultInstance->is_writable($path);
- }
-
static public function isCreatable($path) {
return self::$defaultInstance->isCreatable($path);
}
diff --git a/lib/files/view.php b/lib/files/view.php
index 58e3ee6f05..a59ad8105d 100644
--- a/lib/files/view.php
+++ b/lib/files/view.php
@@ -195,20 +195,6 @@ class View {
return false;
}
- /**
- * @deprecated Replaced by isReadable() as part of CRUDS
- */
- public function is_readable($path) {
- return $this->basicOperation('isReadable', $path);
- }
-
- /**
- * @deprecated Replaced by isCreatable(), isUpdatable(), isDeletable() as part of CRUDS
- */
- public function is_writable($path) {
- return $this->basicOperation('isUpdatable', $path);
- }
-
public function isCreatable($path) {
return $this->basicOperation('isCreatable', $path);
}
diff --git a/lib/filesystem.php b/lib/filesystem.php
index 9ce75aaf8c..ea0a289c8d 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -257,13 +257,6 @@ class OC_Filesystem {
return \OC\Files\Filesystem::isReadable($path);
}
- /**
- * @deprecated Replaced by isCreatable(), isUpdatable(), isDeletable() as part of CRUDS
- */
- static public function is_writable($path) {
- return \OC\Files\Filesystem::is_writable($path);
- }
-
/**
* @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
*/
--
GitLab