From 614e4d485c8b74f6879c401f8cbb93e9335bf9b3 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 18 Nov 2013 17:29:30 +0100
Subject: External storage space is now not counted in total space

Added argument to getFileInfo() to disable adding the size of
mountpoints to a directory's size.

Fixes #5924
---
 lib/private/files/filesystem.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'lib/private/files/filesystem.php')

diff --git a/lib/private/files/filesystem.php b/lib/private/files/filesystem.php
index 8500b3c581b..a83e9aa86d2 100644
--- a/lib/private/files/filesystem.php
+++ b/lib/private/files/filesystem.php
@@ -725,6 +725,8 @@ class Filesystem {
 	 * get the filesystem info
 	 *
 	 * @param string $path
+	 * @param boolean $includeMountPoints whether to add mountpoint sizes,
+	 * defaults to true
 	 * @return array
 	 *
 	 * returns an associative array with the following keys:
@@ -734,8 +736,8 @@ class Filesystem {
 	 * - encrypted
 	 * - versioned
 	 */
-	public static function getFileInfo($path) {
-		return self::$defaultInstance->getFileInfo($path);
+	public static function getFileInfo($path, $includeMountPoints = true) {
+		return self::$defaultInstance->getFileInfo($path, $includeMountPoints);
 	}
 
 	/**
-- 
cgit v1.2.3