diff options
author | Michael Gapczynski <mtgap@owncloud.com> | 2012-07-26 00:54:46 +0400 |
---|---|---|
committer | Michael Gapczynski <mtgap@owncloud.com> | 2012-07-30 18:07:19 +0400 |
commit | f328f53ec17a53efa3136c192dc035c731d94b7f (patch) | |
tree | 641872cbe62da49903e7d9e8d5430f4a5c8989fc /lib/filestorage | |
parent | 099b16350fd33f907f55d9894530b934d1be9a7a (diff) |
Fix filesystem hash, no longer using basicOperation()
Conflicts:
lib/filesystemview.php
Diffstat (limited to 'lib/filestorage')
-rw-r--r-- | lib/filestorage/common.php | 2 | ||||
-rw-r--r-- | lib/filestorage/local.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/filestorage/common.php b/lib/filestorage/common.php index f0bfc064cb5..0d3e2c25fd6 100644 --- a/lib/filestorage/common.php +++ b/lib/filestorage/common.php @@ -110,7 +110,7 @@ abstract class OC_Filestorage_Common extends OC_Filestorage { unlink($tmpFile); return $mime; } - public function hash($type,$path,$raw){ + public function hash($type,$path,$raw = false){ $tmpFile=$this->getLocalFile(); $hash=hash($type,$tmpFile,$raw); unlink($tmpFile); diff --git a/lib/filestorage/local.php b/lib/filestorage/local.php index ea9a9070263..1f3fd2e9249 100644 --- a/lib/filestorage/local.php +++ b/lib/filestorage/local.php @@ -157,7 +157,7 @@ class OC_Filestorage_Local extends OC_Filestorage{ return $return; } - public function hash($type,$path,$raw){ + public function hash($type,$path,$raw = false){ return hash_file($type,$this->datadir.$path,$raw); } |