Properly catch 503 storage not available in getQuotaInfo

When doing a PROPFIND on the root and one of the mount points is not
available, the returned quota attributes will now be zero.

This fix prevents the expected exception to make the whole call fail.
remotes/origin/fix-10825
Vincent Petry 12 years ago
parent 5d391910c5
commit 21d825ed6c
  1. 18
      lib/private/connector/sabre/directory.php

@ -205,13 +205,17 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node
* @return array
*/
public function getQuotaInfo() {
$path = \OC\Files\Filesystem::getView()->getRelativePath($this->info->getPath());
$storageInfo = OC_Helper::getStorageInfo($path);
return array(
$storageInfo['used'],
$storageInfo['free']
);
try {
$path = \OC\Files\Filesystem::getView()->getRelativePath($this->info->getPath());
$storageInfo = OC_Helper::getStorageInfo($path);
return array(
$storageInfo['used'],
$storageInfo['free']
);
}
catch (\OCP\Files\StorageNotAvailableException $e) {
return array(0, 0);
}
}
/**

Loading…
Cancel
Save