aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files_trashbin/lib
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2014-06-04 18:19:48 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2014-06-04 18:19:48 +0200
commita2db53b928f7b0202391fca3c1d746478be9acae (patch)
treebb553df06df4e77b18eca6378fdbc5ee1a42f873 /apps/files_trashbin/lib
parente734caecba15a317428aea4d308b2ff377f0c19b (diff)
parent8ee15025f06b683673101c5604b10798c75a76ae (diff)
downloadnextcloud-server-a2db53b928f7b0202391fca3c1d746478be9acae.tar.gz
nextcloud-server-a2db53b928f7b0202391fca3c1d746478be9acae.zip
Merge pull request #8471 from owncloud/versioning_no_longer_track_the_size
[versioning] let the file cache track the size of the versions
Diffstat (limited to 'apps/files_trashbin/lib')
-rw-r--r--apps/files_trashbin/lib/trashbin.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php
index fb23b516208..a8e66b06bbd 100644
--- a/apps/files_trashbin/lib/trashbin.php
+++ b/apps/files_trashbin/lib/trashbin.php
@@ -905,12 +905,12 @@ class Trashbin {
* get current size of trash bin from a given user
*
* @param string $user user who owns the trash bin
- * @return mixed trash bin size or false if no trash bin size is stored
+ * @return integer trash bin size
*/
private static function getTrashbinSize($user) {
$view = new \OC\Files\View('/' . $user);
$fileInfo = $view->getFileInfo('/files_trashbin');
- return $fileInfo['size'];
+ return isset($fileInfo['size']) ? $fileInfo['size'] : 0;
}
/**