summaryrefslogtreecommitdiffstats
path: root/lib/private
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2014-10-31 10:42:29 +0100
committerVincent Petry <pvince81@owncloud.com>2014-10-31 10:42:29 +0100
commit55658e7bb24156660f12d26d622ee38cda242b38 (patch)
treeec5f89106981c3832dcb0ec8be00f07866c23a5d /lib/private
parenta9b41cbf54323d9b87c9aa46097cb609dcb5d038 (diff)
parent2974d4d3809c75eb3f69474b892fbc12fbe691c9 (diff)
downloadnextcloud-server-55658e7bb24156660f12d26d622ee38cda242b38.tar.gz
nextcloud-server-55658e7bb24156660f12d26d622ee38cda242b38.zip
Merge pull request #11539 from owncloud/mount-setup-once
Only mount the storages for the user once
Diffstat (limited to 'lib/private')
-rw-r--r--lib/private/files/filesystem.php7
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/private/files/filesystem.php b/lib/private/files/filesystem.php
index cdbbbf3d3cd..c7dc99c55cb 100644
--- a/lib/private/files/filesystem.php
+++ b/lib/private/files/filesystem.php
@@ -45,6 +45,7 @@ class Filesystem {
*/
static private $defaultInstance;
+ static private $usersSetup = array();
/**
* classname which used for hooks handling
@@ -321,7 +322,10 @@ class Filesystem {
if ($user == '') {
$user = \OC_User::getUser();
}
- $parser = new \OC\ArrayParser();
+ if (isset(self::$usersSetup[$user])) {
+ return;
+ }
+ self::$usersSetup[$user] = true;
$root = \OC_User::getHome($user);
@@ -427,6 +431,7 @@ class Filesystem {
*/
public static function clearMounts() {
if (self::$mounts) {
+ self::$usersSetup = array();
self::$mounts->clear();
}
}