Fix calculating size for empty folders

Conflicts:
	lib/files/cache/cache.php

diff --git a/lib/files/cache/cache.php b/lib/files/cache/cache.php
index 7b38f1290dd829e5c5b6a135cb594ecc6a2ff801..f605d72a6b398f4559a2bab2f2677a976d01f1bd 100644 (file)
--- a/lib/files/cache/cache.php
+++ b/lib/files/cache/cache.php
@@ -499,27 +499,24 @@ class Cache {
         * @return int
         */
        public function calculateFolderSize($path) {
-               $id = $this->getId($path);
-               if ($id === -1) {
-                       return 0;
-               }
-               $query = \OC_DB::prepare('SELECT `size` FROM `*PREFIX*filecache` WHERE `parent` = ? AND `storage` = ?');
-               $result = $query->execute(array($id, $this->numericId));
                $totalSize = 0;
-               $hasChilds = 0;
-               while ($row = $result->fetchRow()) {
-                       $hasChilds = true;
-                       $size = (int)$row['size'];
-                       if ($size === -1) {
-                               $totalSize = -1;
-                               break;
-                       } else {
-                               $totalSize += $size;
+               $entry = $this->get($path);
+               if ($entry && $entry['mimetype'] === 'httpd/unix-directory') {
+                       $id = $entry['fileid'];
+                       $sql = 'SELECT `size` FROM `*PREFIX*filecache` WHERE `parent` = ? AND `storage` = ?';
+                       $result = \OC_DB::executeAudited($sql, array($id, $this->getNumericStorageId()));
+                       while ($row = $result->fetchRow()) {
+                               $size = (int)$row['size'];
+                               if ($size === -1) {
+                                       $totalSize = -1;
+                                       break;
+                               } else {
+                                       $totalSize += $size;
+                               }
+                       }
+                       if ($entry['size'] !== $totalSize) {
+                               $this->update($id, array('size' => $totalSize));
                        }
-               }
-
-               if ($hasChilds) {
-                       $this->update($id, array('size' => $totalSize));
                }
                return $totalSize;
        }