summaryrefslogtreecommitdiffstats
path: root/lib/private/files/cache/scanner.php
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-04-20 16:50:12 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2015-04-20 16:50:12 +0200
commit32995ace1c1ea453e08b1afd6f6d43cf68f2e3b1 (patch)
treea053ba852ac968f33f6e781a55ac2016e72ed929 /lib/private/files/cache/scanner.php
parenta637bd7f2b82bf52515a198071d74b776d492f28 (diff)
downloadnextcloud-server-32995ace1c1ea453e08b1afd6f6d43cf68f2e3b1.tar.gz
nextcloud-server-32995ace1c1ea453e08b1afd6f6d43cf68f2e3b1.zip
move permission related code into getMetaData()
Diffstat (limited to 'lib/private/files/cache/scanner.php')
-rw-r--r--lib/private/files/cache/scanner.php10
1 files changed, 2 insertions, 8 deletions
diff --git a/lib/private/files/cache/scanner.php b/lib/private/files/cache/scanner.php
index 713dcda3ac3..d253afbfa1d 100644
--- a/lib/private/files/cache/scanner.php
+++ b/lib/private/files/cache/scanner.php
@@ -103,16 +103,10 @@ class Scanner extends BasicEmitter {
* @return array an array of metadata of the file
*/
public function getData($path) {
- $permissions = $this->storage->getPermissions($path);
- if (!$permissions & \OCP\PERMISSION_READ) {
- //cant read, nothing we can do
+ $data = $this->storage->getMetaData($path);
+ if (is_null($data)) {
\OCP\Util::writeLog('OC\Files\Cache\Scanner', "!!! Path '$path' is not accessible or present !!!", \OCP\Util::DEBUG);
- return null;
}
-
- $data = $this->storage->getMetaData($path);
- $data['permissions'] = $permissions;
-
return $data;
}