Merge branch 'share_api'

Conflicts:
	apps/contacts/lib/vcard.php
	apps/files/index.php
	lib/files.php

1 files changed, 25 insertions, 4 deletions

diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index 6e76e1b6da5..a888e5340ea 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -211,11 +211,32 @@ class OC_FilesystemView {
 		}
 		return false;
 	}
-	public function is_readable($path) {
-		return $this->basicOperation('is_readable', $path);
+	/**
+	* @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);
+	}
+	public function isReadable($path) {
+		return $this->basicOperation('isReadable', $path);
+	}
+	public function isUpdatable($path) {
+		return $this->basicOperation('isUpdatable', $path);
+	}
+	public function isDeletable($path) {
+		return $this->basicOperation('isDeletable', $path);
 	}
-	public function is_writable($path) {
-		return $this->basicOperation('is_writable', $path);
+	public function isSharable($path) {
+		return $this->basicOperation('isSharable', $path);
 	}
 	public function file_exists($path) {
 		if($path=='/'){