summaryrefslogtreecommitdiffstats
path: root/apps/files_sharing
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2014-03-25 22:33:24 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2014-03-25 22:33:24 +0100
commitbbc2e37259128ba12082e731bacdc740495ba2ea (patch)
tree7e2c97972b8d54114548f00fc6e9efbd49064eae /apps/files_sharing
parent86356db0449b13816143102aebcb1328f62f21d4 (diff)
parentd55c7223a96e259543d28f53474a17525fdac25f (diff)
downloadnextcloud-server-bbc2e37259128ba12082e731bacdc740495ba2ea.tar.gz
nextcloud-server-bbc2e37259128ba12082e731bacdc740495ba2ea.zip
Merge pull request #7477 from owncloud/foldersize-reuse
Allow re-using already known fileinfo when calculating folder sizes
Diffstat (limited to 'apps/files_sharing')
-rw-r--r--apps/files_sharing/lib/cache.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/files_sharing/lib/cache.php b/apps/files_sharing/lib/cache.php
index 10f2182655f..01db29d72e2 100644
--- a/apps/files_sharing/lib/cache.php
+++ b/apps/files_sharing/lib/cache.php
@@ -357,9 +357,10 @@ class Shared_Cache extends Cache {
* get the size of a folder and set it in the cache
*
* @param string $path
+ * @param array $entry (optional) meta data of the folder
* @return int
*/
- public function calculateFolderSize($path) {
+ public function calculateFolderSize($path, $entry = null) {
if ($cache = $this->getSourceCache($path)) {
return $cache->calculateFolderSize($this->files[$path]);
}