From 439578288facbae3144f131aca85a7235f622053 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 7 Jan 2013 01:03:11 +0100
Subject: Cache: split permission cache scanning and cache scanning

---
 lib/files/cache/scanner.php | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'lib/files/cache/scanner.php')

diff --git a/lib/files/cache/scanner.php b/lib/files/cache/scanner.php
index 4c0ec9617f9..526d4a2aab5 100644
--- a/lib/files/cache/scanner.php
+++ b/lib/files/cache/scanner.php
@@ -24,11 +24,6 @@ class Scanner {
 	 */
 	private $cache;
 
-	/**
-	 * @var \OC\Files\Cache\Permissions $permissionsCache
-	 */
-	private $permissionsCache;
-
 	const SCAN_RECURSIVE = true;
 	const SCAN_SHALLOW = false;
 
@@ -36,7 +31,6 @@ class Scanner {
 		$this->storage = $storage;
 		$this->storageId = $this->storage->getId();
 		$this->cache = $storage->getCache();
-		$this->permissionsCache = $storage->getPermissionsCache();
 	}
 
 	/**
@@ -53,10 +47,8 @@ class Scanner {
 		$data['mtime'] = $this->storage->filemtime($path);
 		if ($data['mimetype'] == 'httpd/unix-directory') {
 			$data['size'] = -1; //unknown
-			$data['permissions'] = $this->storage->getPermissions($path . '/');
 		} else {
 			$data['size'] = $this->storage->filesize($path);
-			$data['permissions'] = $this->storage->getPermissions($path);
 		}
 		return $data;
 	}
@@ -81,7 +73,6 @@ class Scanner {
 				}
 			}
 			$id = $this->cache->put($file, $data);
-			$this->permissionsCache->set($id, \OC_User::getUser(), $data['permissions']);
 		}
 		return $data;
 	}
-- 
cgit v1.2.3