diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-06-05 10:05:05 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-06-05 10:05:05 +0200 |
| commit | ff3ded6cb2f8542c3b2a083f4dabc83ccfa1888e (patch) | |
| tree | bc041a07259ea4ba303503ac2ede3a4435f672b5 /lib/private/files/node | |
| parent | cb61d8a2265b3d623b676f0cd35f93921961f044 (diff) | |
| parent | da3974bcb210a6580c974e1b2efebcae26ccf708 (diff) | |
| download | nextcloud-server-ff3ded6cb2f8542c3b2a083f4dabc83ccfa1888e.tar.gz nextcloud-server-ff3ded6cb2f8542c3b2a083f4dabc83ccfa1888e.zip | |
Merge pull request #8852 from owncloud/kill-permissions-master
Kill permissions table
Diffstat (limited to 'lib/private/files/node')
| -rw-r--r-- | lib/private/files/node/folder.php | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/lib/private/files/node/folder.php b/lib/private/files/node/folder.php index 1af34fc2be6..3e23f5c2c94 100644 --- a/lib/private/files/node/folder.php +++ b/lib/private/files/node/folder.php @@ -71,13 +71,11 @@ class Folder extends Node implements \OCP\Files\Folder { list($storage, $internalPath) = $this->view->resolvePath($this->path); if ($storage) { $cache = $storage->getCache($internalPath); - $permissionsCache = $storage->getPermissionsCache($internalPath); //trigger cache update check $this->view->getFileInfo($this->path); $files = $cache->getFolderContents($internalPath); - $permissions = $permissionsCache->getDirectoryPermissions($this->getId(), $this->root->getUser()->getUID()); } else { $files = array(); } @@ -129,9 +127,6 @@ class Folder extends Node implements \OCP\Files\Folder { foreach ($files as $file) { if ($file) { - if (isset($permissions[$file['fileid']])) { - $file['permissions'] = $permissions[$file['fileid']]; - } $node = $this->createNode($this->path . '/' . $file['name'], $file); $result[] = $node; } |