From: Vincent Petry <pvince81@owncloud.com>
Date: Fri, 4 Apr 2014 08:18:02 +0000 (+0200)
Subject: Merge pull request #8015 from owncloud/storageinfo-reuse
X-Git-Tag: v7.0.0alpha2~502
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8a10c44eb33d45e2deba7d72b30e509fa332fb24;p=nextcloud-server.git

Merge pull request #8015 from owncloud/storageinfo-reuse

Allow reusing FileInfo for getStorageInfo
---

8a10c44eb33d45e2deba7d72b30e509fa332fb24
diff --cc apps/files/index.php
index 7d25c816eb7,f2c5bd13359..b8ff08c1b05
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@@ -70,10 -94,10 +70,10 @@@ $config = \OC::$server->getConfig()
  $permissions = $dirInfo->getPermissions();
  
  // information about storage capacities
- $storageInfo=OC_Helper::getStorageInfo($dir);
+ $storageInfo=OC_Helper::getStorageInfo($dir, $dirInfo);
  $freeSpace=$storageInfo['free'];
  $uploadLimit=OCP\Util::uploadLimit();
 -$maxUploadFilesize=OCP\Util::maxUploadFilesize($dir);
 +$maxUploadFilesize=OCP\Util::maxUploadFilesize($dir, $freeSpace);
  $publicUploadEnabled = $config->getAppValue('core', 'shareapi_allow_public_upload', 'yes');
  // if the encryption app is disabled, than everything is fine (INIT_SUCCESSFUL status code)
  $encryptionInitStatus = 2;