Merge master into ocs_api

1 files changed, 10 insertions, 1 deletions

diff --git a/lib/filestorage/common.php b/lib/filestorage/common.php
index 351714437c5..f24a5704913 100644
--- a/lib/filestorage/common.php
+++ b/lib/filestorage/common.php
@@ -260,7 +260,7 @@ abstract class OC_Filestorage_Common extends OC_Filestorage {
 		if($dh) {
 			while($item=readdir($dh)) {
 				if ($item == '.' || $item == '..') continue;
-				if(strstr(strtolower($item),strtolower($query))!==false) {
+				if(strstr(strtolower($item), strtolower($query))!==false) {
 					$files[]=$dir.'/'.$item;
 				}
 				if($this->is_dir($dir.'/'.$item)) {
@@ -279,4 +279,13 @@ abstract class OC_Filestorage_Common extends OC_Filestorage {
 	public function hasUpdated($path,$time) {
 		return $this->filemtime($path)>$time;
 	}
+
+	/**
+	 * get the owner of a path
+	 * @param $path The path to get the owner
+	 * @return string uid or false
+	 */
+	public function getOwner($path) {
+		return OC_User::getUser();
+	}
 }