summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Reschke <lukas@statuscode.ch>2013-02-19 01:34:49 -0800
committerLukas Reschke <lukas@statuscode.ch>2013-02-19 01:34:49 -0800
commit3d7545269bae7aa38de2abbc4d327beab986fc82 (patch)
tree874e3e374311f72cdc6a30a4b2051c46f94b89db
parentc56542c58dedd3391aa79d7848d955b39b2ce6ac (diff)
parente2f87e456f05ecafeefff29a1e2bf996f692a050 (diff)
downloadnextcloud-server-3d7545269bae7aa38de2abbc4d327beab986fc82.tar.gz
nextcloud-server-3d7545269bae7aa38de2abbc4d327beab986fc82.zip
Merge pull request #1764 from owncloud/Undelete_directory_fix
Fix for Undelete directory action
-rw-r--r--apps/files_trashbin/lib/trash.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php
index 76844ca92e9..fbc3954c040 100644
--- a/apps/files_trashbin/lib/trash.php
+++ b/apps/files_trashbin/lib/trash.php
@@ -396,6 +396,9 @@ class Trashbin {
*/
private static function calculateSize($view) {
$root = \OCP\Config::getSystemValue('datadirectory').$view->getAbsolutePath('');
+ if (!file_exists($root)) {
+ return 0;
+ }
$iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($root), \RecursiveIteratorIterator::CHILD_FIRST);
$size = 0;