diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2013-09-23 10:39:12 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2013-09-23 10:39:12 +0200 |
| commit | f6e8a388a90fff82c16589cf09911ef3aeb4005d (patch) | |
| tree | a47f16ed41fa3b884a4d709ef09136a4d0c785d0 /apps/files/ajax/delete.php | |
| parent | 82cbbb8ab8cfe81559c45905d7fca819d71df346 (diff) | |
| parent | 9851f0f4f2a97dc6ac1382bcd533eb23feffa4e0 (diff) | |
| download | nextcloud-server-f6e8a388a90fff82c16589cf09911ef3aeb4005d.tar.gz nextcloud-server-f6e8a388a90fff82c16589cf09911ef3aeb4005d.zip | |
Merge branch 'master' into encryption_improved_error_messages_4617
Conflicts:
settings/ajax/changepassword.php
Diffstat (limited to 'apps/files/ajax/delete.php')
| -rw-r--r-- | apps/files/ajax/delete.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files/ajax/delete.php b/apps/files/ajax/delete.php index 5f4856ec790..c69f5a8860c 100644 --- a/apps/files/ajax/delete.php +++ b/apps/files/ajax/delete.php @@ -24,7 +24,7 @@ foreach ($files as $file) { } // get array with updated storage stats (e.g. max file size) after upload -$storageStats = \OCA\files\lib\Helper::buildFileStorageStatistics($dir); +$storageStats = \OCA\Files\Helper::buildFileStorageStatistics($dir); if ($success) { OCP\JSON::success(array("data" => array_merge(array("dir" => $dir, "files" => $files), $storageStats))); |