aboutsummaryrefslogtreecommitdiffstats
path: root/lib/filestorage/common.php
diff options
context:
space:
mode:
Diffstat (limited to 'lib/filestorage/common.php')
-rw-r--r--lib/filestorage/common.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/filestorage/common.php b/lib/filestorage/common.php
index 3c06570d890..b97eb79d8d4 100644
--- a/lib/filestorage/common.php
+++ b/lib/filestorage/common.php
@@ -204,7 +204,7 @@ abstract class OC_Filestorage_Common extends OC_Filestorage {
unlink($tmpFile);
return $mime;
}
- public function hash($type,$path, $raw = false) {
+ public function hash($type, $path, $raw = false) {
$tmpFile=$this->getLocalFile();
$hash=hash($type, $tmpFile, $raw);
unlink($tmpFile);
@@ -264,7 +264,7 @@ abstract class OC_Filestorage_Common extends OC_Filestorage {
$files[]=$dir.'/'.$item;
}
if($this->is_dir($dir.'/'.$item)) {
- $files=array_merge($files,$this->searchInDir($query, $dir.'/'.$item));
+ $files=array_merge($files, $this->searchInDir($query, $dir.'/'.$item));
}
}
}