From 91fc933432db4ee37bdc8e6671d4eec512de326a Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 30 Jan 2015 15:35:54 +0100 Subject: [PATCH] Revert "Close cursor early in calculateFolderSize" This reverts commit 234f33e01e630f763f34c51114d25986bae02b42. --- lib/private/files/cache/cache.php | 3 --- lib/private/files/cache/homecache.php | 1 - 2 files changed, 4 deletions(-) diff --git a/lib/private/files/cache/cache.php b/lib/private/files/cache/cache.php index 8322b0f6b9c7..7ea00325a101 100644 --- a/lib/private/files/cache/cache.php +++ b/lib/private/files/cache/cache.php @@ -540,7 +540,6 @@ public function calculateFolderSize($path, $entry = null) { 'WHERE `parent` = ? AND `storage` = ?'; $result = \OC_DB::executeAudited($sql, array($id, $this->getNumericStorageId())); if ($row = $result->fetchRow()) { - $result->closeCursor(); list($sum, $min, $unencryptedSum) = array_values($row); $sum = 0 + $sum; $min = 0 + $min; @@ -563,8 +562,6 @@ public function calculateFolderSize($path, $entry = null) { if ($totalSize !== -1 and $unencryptedSum > 0) { $totalSize = $unencryptedSum; } - } else { - $result->closeCursor(); } } return $totalSize; diff --git a/lib/private/files/cache/homecache.php b/lib/private/files/cache/homecache.php index ad7f587b8b6d..2b3967c8807d 100644 --- a/lib/private/files/cache/homecache.php +++ b/lib/private/files/cache/homecache.php @@ -35,7 +35,6 @@ public function calculateFolderSize($path, $entry = null) { 'WHERE `parent` = ? AND `storage` = ? AND `size` >= 0'; $result = \OC_DB::executeAudited($sql, array($id, $this->getNumericStorageId())); if ($row = $result->fetchRow()) { - $result->closeCursor(); list($sum, $unencryptedSum) = array_values($row); $totalSize = 0 + $sum; $unencryptedSize = 0 + $unencryptedSum;